resolved conflicts for merge of 222a835d to master
resolved conflicts for merge of 222a835d to master

Change-Id: I82b1f9338eadaed07dc803e56682f4bbb2a97fc3

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