resolved conflicts for merge of 343597c3 to jb-dev-plus-aosp
resolved conflicts for merge of 343597c3 to jb-dev-plus-aosp

Change-Id: I84648a8044e6238a57b4a08a261146bfa3c8c1c7

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