Snap for 7647318 from 7c5081f6d60036828862b827d159e1d32b96da83 to sc-d1-release

Change-Id: If6cc75929d33c4b3b6f36e1c8732efee70592990
diff --git a/current/Android.bp b/current/Android.bp
index cf264ff..969e5e5 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -33,7 +33,7 @@
 
 module_prebuilt_bootclasspath_fragment {
     name: "com.android.mediaprovider-bootclasspath-fragment",
-    prefer: false,
+    prefer: true,
     soong_config_variables: {
         module_build_from_source: {
             prefer: false,
@@ -89,7 +89,7 @@
 
 module_java_sdk_library_import {
     name: "framework-mediaprovider",
-    prefer: false,
+    prefer: true,
     soong_config_variables: {
         module_build_from_source: {
             prefer: false,