Merge "riscv64: fix mips-ism." am: 2077cea0 am: 25e7c35a am: 91d224ce am: c0e9a46c

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



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