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

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

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