AI 144009: am: CL 144007 am: CL 144006 Set a real 3.xml, which is the current...

AI 144009: am: CL 144007 am: CL 144006 Set a real 3.xml, which is the current candidate cupcake API.
  This allows work done in later codelines to have proper
  backward-compatibility checks.
  Original author: jbq
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 144009