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

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