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

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

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