Merge "Specify the API level via the triple instead of __ANDROID_API__." am:...
Merge "Specify the API level via the triple instead of __ANDROID_API__." am: 5f66d76d am: cb521cb1 am: 1213f4b9
am: 74caaca7
Change-Id: Ie6a0a746336a4797a30d8dccd7c2fd0308e2c5e2