resolved conflicts for merge of 822fa972 to master
resolved conflicts for merge of 822fa972 to master

Change-Id: Ic7a7499b2058abbc6cefd94a0a06a95ef8c4d61c

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