resolved conflicts for merge of 9b7ebf5d to master
resolved conflicts for merge of 9b7ebf5d to master

Change-Id: I0dfbc70b4b52a69ba43f14def4203ece8d9c9090

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