Merge "Revert "Fix MediaPlayer2Test on 32bit mode""

apex/Android.bp

@@ -16,31 +16,21 @@ apex {
     name: "com.android.media",
     manifest: "manifest.json",
     java_libs: ["updatable-media"],
-    compile_multilib: "both",
-    multilib: {
-        first: {
-            // Extractor process runs only with the primary ABI.
-            native_shared_libs: [
-                // Extractor plugins
-                "libaacextractor",
-                "libamrextractor",
-                "libflacextractor",
-                "libmidiextractor",
-                "libmkvextractor",
-                "libmp3extractor",
-                "libmp4extractor",
-                "libmpeg2extractor",
-                "liboggextractor",
-                "libwavextractor",
-            ],
-        },
-        both: {
-            native_shared_libs: [
-                // MediaPlayer2
-                "libmedia2_jni",
-            ],
-        },
-    },
+    native_shared_libs: [
+        // Extractor plugins
+        "libaacextractor",
+        "libamrextractor",
+        "libflacextractor",
+        "libmidiextractor",
+        "libmkvextractor",
+        "libmp3extractor",
+        "libmp4extractor",
+        "libmpeg2extractor",
+        "liboggextractor",
+        "libwavextractor",
+        // MediaPlayer2
+        "libmedia2_jni",
+    ],
     key: "com.android.media.key",
 }