Merge changes from topic "reland-hack-rv64-libc++" into main am: db195fd4...

Merge changes from topic "reland-hack-rv64-libc++" into main am: db195fd4 am: 83290c06 am: cd520ba8

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2677916



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