am 8e9cacc5: merge from open-source master

Merge commit '8e9cacc5eb1618b34373ac9131561560a56b4661'

* commit '8e9cacc5eb1618b34373ac9131561560a56b4661':
  Disable building libdiskconfig on non-Linux hosts