Merge "Revert "Move Matrix operations multiplyMM and MultiplMV out of jni""