Merge "Matrix JNI update"