resolved conflicts for merge of 67e0c2a6 to master
resolved conflicts for merge of 67e0c2a6 to master

Change-Id: I7940c7ae3dd1900180e4767f1c86957db4cf3a1f

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