am 48ec6d6f: Merge "Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build."
am 48ec6d6f: Merge "Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build."

* commit '48ec6d6f814a70068c4632b468cd7872f34295ad':
  Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build.

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