resolved conflicts for merge of 8928ef8b to master
resolved conflicts for merge of 8928ef8b to master

Change-Id: I0c2fa435b38266f71651756570926c4b1488b57e

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