am 349e915d: am cb241895: am a9baf879: Merge "fix build"
am 349e915d: am cb241895: am a9baf879: Merge "fix build"

* commit '349e915dafbcebafcf204bda12739f9287ae51ce':
  fix build

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