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

Change-Id: I0d96d8f0f2d505360dac3e30c95c599a895d0f5c