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

Change-Id: If4f60f120d9cc97c22b69179e9bd0804882c5a14