resolved conflicts for merge of cbc479c3 to master
resolved conflicts for merge of cbc479c3 to master

Change-Id: Ie421c405d2a52f6c7f1d65f44e0576e32842a559

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