Android 1.6 release 1.2
auto import from //depot/cupcake/@135843
716 files changed