am bec648ee: am 8db4b91b: am d2236e2c: Merge "Fix Mac build."

* commit 'bec648ee9f47c4120e5a4f82c7f0e6d225cb107f':
  Fix Mac build.