am 04b963a1: Merge "emulator: Build emulator platform images as ARMv7-A"
am 04b963a1: Merge "emulator: Build emulator platform images as ARMv7-A"

* commit '04b963a1c037a7e9e8b5fb46603e009965293d9d':
  emulator: Build emulator platform images as ARMv7-A

xorware/android_build,knone1/platform_manifest,xorware/android_build,pranav01/platform_manifest,see4ri/lolili,fallouttester/platform_manifest,xorware/android_build,Hybrid-Power/startsync,hagar006/platform_manifest,xorware/android_build,xorware/android_build,ND-3500/platform_manifest,RR-msm7x30/platform_manifest