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

Change-Id: I3b89fb8a09f7c3e1a23695572bca33751626542d

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