resolved conflicts for merge of 296e4828 to master
resolved conflicts for merge of 296e4828 to master

Change-Id: Iae41a458f1eed497119c3abe4bf27194821c075d

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