AI 143354: am: CL 143203 am: CL 142986 Work on issue #1739922 (Removed unused...

AI 143354: am: CL 143203 am: CL 142986 Work on issue #1739922 (Removed unused resources).  We don't seem to use these.
  Original author: hackbod
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143354