Roll Android SDK to v21

BUG=424680

Review URL: https://codereview.chromium.org/661073003

Cr-Commit-Position: refs/heads/master@{#300193}
5 files changed