Merge changes from topic "reland-hack-rv64-libc++" into main am: db195fd4cb am: 83290c0614 am: cd520ba878

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>

cc/api_level.go

@@ -31,7 +31,11 @@ func MinApiForArch(ctx android.EarlyModuleContext,
 	case android.Arm64, android.X86_64:
 		return android.FirstLp64Version
 	case android.Riscv64:
-		return android.FutureApiLevel
+		apiLevel, err := android.ApiLevelFromUser(ctx, "VanillaIceCream")
+		if err != nil {
+			panic(err)
+		}
+		return apiLevel
 	default:
 		panic(fmt.Errorf("Unknown arch %q", arch))
 	}