Android 1.6 release 2
auto import from //depot/cupcake/@135843
29 files changed