Merge "Specify the API level via the triple instead of __ANDROID_API__." am: 5f66d76d69 am: cb521cb1ca
am: 1213f4b978

Change-Id: I32e07a45175ca3b9ebc3f52a0e34b7e52b0aca98