resolved conflicts for merge of 572d0d7d to jb-dev-plus-aosp
resolved conflicts for merge of 572d0d7d to jb-dev-plus-aosp

Change-Id: I6c750adcf06457bf8a3b47423c990be6e9d23bbb

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