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

* commit '8db4b91bd2a069b2afb377f7e5190f625c3002cf':
  Fix Mac build.