am 8d6da447: merge from open-source master

Merge commit '8d6da4478c27c1b65629a4c2966e7382e3f45fb1'

* commit '8d6da4478c27c1b65629a4c2966e7382e3f45fb1':
  Build the host version of libdiskconfig