Merge "native: Cleanup jni usage code" am: e42d717194
am: 48ed85a052

Change-Id: I5bd135760f5da45998a7038e143c8b32855c15bf