am 345cbd2d: am cd0bd801: merge from open-source master
am 345cbd2d: am cd0bd801: merge from open-source master

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