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

Change-Id: Ib49f05e6ef0e6159788d866ccb9f0bb69d500f93