resolved conflicts for merge of 5cc2e94f to master
resolved conflicts for merge of 5cc2e94f to master

Change-Id: I7707603ae64fa3e4371fab2e81aab7ec37e69d33

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