resolved conflicts for merge of 54c29015 to master
resolved conflicts for merge of 54c29015 to master

Change-Id: I0b45ef84343289e84c6bcdf64b6ca4c0aff414c5

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