Merge "native: Cleanup jni usage code"