Merge "[RISC-V] rv64gc_zbb for Android" am: 13ca1a9207 am: ee2b141a09

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

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