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

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

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



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