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

Change-Id: I17f612c055b12f6a8eb3ed89e2769ecb9c68de05