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

Change-Id: I5f6bc88a946c00b93cb501afbeaecf6bbfbf20de