Merge "Merge mainline-release 6664920 to master - DO NOT MERGE"
diff --git a/apex/manifest.json b/apex/manifest.json
index ddd642e..4254bdf 100644
--- a/apex/manifest.json
+++ b/apex/manifest.json
@@ -1,4 +1,4 @@
 {
   "name": "com.android.media",
-  "version": 300000000
+  "version": 300900700
 }
diff --git a/apex/manifest_codec.json b/apex/manifest_codec.json
index 1f05d2e..8bb3ce4 100644
--- a/apex/manifest_codec.json
+++ b/apex/manifest_codec.json
@@ -1,7 +1,4 @@
 {
   "name": "com.android.media.swcodec",
-  "version": 300000000,
-  "requireNativeLibs": [
-    ":sphal"
-  ]
+  "version": 300900700
 }