Merge "jni: Add platform-private convenience headers"
am: 877075b557

Change-Id: Ie7fe64098c7205ace9543aba80675e69b033303c