am d0c8ef98: am 1e7f6f74: Fix build.
am d0c8ef98: am 1e7f6f74: Fix build.

* commit 'd0c8ef989e1d1a11179f56732113ecd8267b4260':
  Fix build.

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