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

Change-Id: I9381e982495bddb4ddba12bdc46f8c4becddd6bf

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