am a9baf879: Merge "fix build"
am a9baf879: Merge "fix build"

* commit 'a9baf8795e5d770a2e0ee7da22781701842932bd':
  fix build

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