Merge "jni: Add platform-private convenience headers" am: 877075b557 am: 804d81fb29
am: 0f94e5c0b6

Change-Id: Ib4757ca028649f9201d7a58a03f93ac4e84fafaa