AI 145622: am: CL 145380 Fixes for add-on build   Original author: xav   Merged from: //branches/cupcake/...
AI 145622: am: CL 145380 Fixes for add-on build
  Original author: xav
  Merged from: //branches/cupcake/...

Automated import of CL 145622

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