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 am: dee3bad2

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



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