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

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

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