Merge "riscv64: fix mips-ism." am: 2077cea07d am: 25e7c35a66

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2498815

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