am 1343ec16: am b75fe469: am eafdd2cd: Fix emulator builds
am 1343ec16: am b75fe469: am eafdd2cd: Fix emulator builds

* commit '1343ec169c1bbbf7c5f1d5d2ce6d30d27bbea992':
  Fix emulator builds

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