merge from open-source master
merge from open-source master

Change-Id: I55d36474223c79e6ab5000b2cb09b01762eb3823

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