am eafdd2cd: Fix emulator builds
am eafdd2cd: Fix emulator builds

* commit 'eafdd2cd878c8fd23033302a2c5010505412981f':
  Fix emulator builds

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