am ebf93bb5: am 75b28573: Fix sim build for unbundling native code
am ebf93bb5: am 75b28573: Fix sim build for unbundling native code

Merge commit 'ebf93bb5c4585e783813ed5fcc54fc02b80ea460' into gingerbread-plus-aosp

* commit 'ebf93bb5c4585e783813ed5fcc54fc02b80ea460':
  Fix sim build for unbundling native code

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