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

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