Merge Android 14 QPR2 to AOSP main

Bug: 319669529
Merged-In: I4145ae54f9fc57d93dac0a8e9903c0e7982bede0
Change-Id: I6663fc833c58b96cf0eac2a27f92e074ca9eb2d7
diff --git a/s2storage/Android.bp b/s2storage/Android.bp
index ef525ce..1664f66 100644
--- a/s2storage/Android.bp
+++ b/s2storage/Android.bp
@@ -33,8 +33,9 @@
 }
 
 // Generic read/write storage classes
-java_library_host {
+java_library {
     name: "s2storage_rw",
+    host_supported: true,
     srcs: [
         "src/write/java/**/*.java",
     ],