am a67b5aee: am c3eb68c4: pull goldfish specific stuffs from emulator.mk
am a67b5aee: am c3eb68c4: pull goldfish specific stuffs from emulator.mk

* commit 'a67b5aeeb84d4fb368eea4e939cd5ecad1b12760':
  pull goldfish specific stuffs from emulator.mk

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