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

Change-Id: If623b4236cfa2bc0fffcb7235d2bd080edbbe774