Automated import from //branches/master/...@140824,140824
Automated import from //branches/master/...@140824,140824

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