am 4162cc60: am 21b75e26: am d52afdd6: Merge "(Hopefully) fix the Mac build."

* commit '4162cc606c05f914aefd4edfa75486767777b67a':
  (Hopefully) fix the Mac build.