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

* commit '4daa8b51de9fb8c0d2822aa700fdc6a71762831d':
  Fix host Mac build.