Merge "Use JNI types for return types of JNI methods" into rvc-dev