Merge "Define __ANDROID_API__ when building for the NDK." am: 30fe7576d0 am: aede8d4912 am: 77233f4fc9
am: 92ed0751c9

Change-Id: I2a1393061aadfacb7f41b1f5147d7bcb69424ce9