Merge "Define __ANDROID_API__ when building for the NDK." am: 30fe7576d0
am: aede8d4912

Change-Id: I26eec6e4cac0a30cb3184e3b1ea3893715950cae