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
am: 9b72be78
Change-Id: Id052ce2f5eed4ee4a46b1368296afc2f6b807ad1