am d9a8e1b3: am ef453a51: Fix ARMv7 -user builds
am d9a8e1b3: am ef453a51: Fix ARMv7 -user builds

Merge commit 'd9a8e1b30961392bc818467ae526f6cca35ced8d'

* commit 'd9a8e1b30961392bc818467ae526f6cca35ced8d':
  Fix ARMv7 -user builds

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