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

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2382752



Change-Id: If281a6e4e155f86e3d30347f2776e349599d7de6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>