Merge changes from topic "hack-rv64-libc++" into main am: 5dbed51365

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

Change-Id: Id1092de948ce87969bc059a913f083cbf6ce3056
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))
 	}

cc/stl.go

@@ -80,8 +80,7 @@ func (stl *stl) begin(ctx BaseModuleContext) {
 			return ""
 		}
 		s = deduplicateStlInput(s)
-		archHasNDKStl := ctx.Arch().ArchType != android.Riscv64
-		if ctx.useSdk() && ctx.Device() && archHasNDKStl {
+		if ctx.useSdk() && ctx.Device() {
 			switch s {
 			case "", "system":
 				return "ndk_system"