Cheryr-pick of 424de177
Cheryr-pick of 424de177

"resolved conflicts for merge of 0f085e5a to gingerbread-plus-aosp"

Change-Id: If2932eeb7a6f0420edf52ac343901afd68ce11fa

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