Merge "Add __ANDROID_API__ checks to NDK header." am: 3f3ab38ddc
am: 8c96144cf0

Change-Id: Ia2783fed1a2f79fa43db4592e3248d26342acaa6