Merge Android 24Q1 Release (ab/11220357)

Bug: 319669529
Merged-In: I2fc29a89d55521ef0c2309348b222a82284c7057
Change-Id: I4145ae54f9fc57d93dac0a8e9903c0e7982bede0
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",
     ],