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

Automated import of CL 145660
1 file changed