am a10263ed: am ccf1cc55: Merge "Fix the mac build."
am a10263ed: am ccf1cc55: Merge "Fix the mac build."

* commit 'a10263ed1f1532127a135943dce993443c5dca51':
  Fix the mac build.

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build