Merge "jni: Add platform-private convenience headers"