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

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