Android 1.6 release 1.5
auto import from //branches/cupcake_rel/...@138607
103 files changed