am fc9f8c00: am 4daa8b51: Merge "Fix host Mac build."

* commit 'fc9f8c00f2bb7c415a2950e025bc7d24e1551984':
  Fix host Mac build.