Switch to targetSdkVersion=21. b/16408109

Change-Id: I5c52570115225324e91b8133e0aae7ea1da19348
2 files changed