Merge "clean up jni code"