Merge "Add jni_uses_platform_api property to android_app" am: 1a9be9f3d0

Change-Id: I7fad0b69e24c6017dbf8d09d027cc86ba8e49200