Android SDK tools release 2
auto import from //depot/cupcake/@135843
8 files changed