android-sdk r21.1

Closes #17851.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>