diff --git a/aosp/frameworks/av/services/mediacodec/main_codecservice.cpp b/aosp/frameworks/av/services/mediacodec/main_codecservice.cpp
index 6a82b1b6b818a74d0b2767e7aa999445900441a7..d17314d75ca01a51c25e71b5d2f3457c17d861c2 100644
--- a/aosp/frameworks/av/services/mediacodec/main_codecservice.cpp
+++ b/aosp/frameworks/av/services/mediacodec/main_codecservice.cpp
@@ -17,9 +17,6 @@
 
 #include <android-base/logging.h>
 
-// from LOCAL_C_INCLUDES
-#include "minijail.h"
-
 #include <binder/ProcessState.h>
 #include <cutils/properties.h>
 #include <hidl/HidlTransportSupport.h>
@@ -30,18 +27,11 @@
 
 using namespace android;
 
-// Must match location in Android.mk.
-static const char kSystemSeccompPolicyPath[] =
-        "/system/etc/seccomp_policy/mediacodec.policy";
-static const char kVendorSeccompPolicyPath[] =
-        "/vendor/etc/seccomp_policy/mediacodec.policy";
-
 int main(int argc __unused, char** argv)
 {
     strcpy(argv[0], "media.codec");
     LOG(INFO) << "mediacodecservice starting";
     signal(SIGPIPE, SIG_IGN);
-    SetUpMinijail(kSystemSeccompPolicyPath, kVendorSeccompPolicyPath);
 
     android::ProcessState::initWithDriver("/dev/vndbinder");
     android::ProcessState::self()->startThreadPool();
diff --git a/aosp/frameworks/av/services/mediacodec/main_swcodecservice.cpp b/aosp/frameworks/av/services/mediacodec/main_swcodecservice.cpp
index d91b7887a48c1f137b6404df965809d17132605e..18f18e966133b1402b40a5a8dc881c0c30c89c3a 100644
--- a/aosp/frameworks/av/services/mediacodec/main_swcodecservice.cpp
+++ b/aosp/frameworks/av/services/mediacodec/main_swcodecservice.cpp
@@ -18,26 +18,16 @@
 #include <android-base/logging.h>
 
 // from LOCAL_C_INCLUDES
-#include "minijail.h"
 #include <hidl/HidlTransportSupport.h>
 
 using namespace android;
 
-// kSystemSeccompPolicyPath points to the policy for the swcodecs themselves and
-// is part of the updates. kVendorSeccompPolicyPath points to any additional
-// policies that the vendor may need for the device.
-static const char kSystemSeccompPolicyPath[] =
-        "/apex/com.android.media.swcodec/etc/seccomp_policy/mediaswcodec.policy";
-static const char kVendorSeccompPolicyPath[] =
-        "/vendor/etc/seccomp_policy/mediaswcodec.policy";
-
 extern "C" void RegisterCodecServices();
 
 int main(int argc __unused, char** argv)
 {
     LOG(INFO) << "media swcodec service starting";
     signal(SIGPIPE, SIG_IGN);
-    SetUpMinijail(kSystemSeccompPolicyPath, kVendorSeccompPolicyPath);
     strcpy(argv[0], "media.swcodec");
 
     ::android::hardware::configureRpcThreadpool(64, false);
diff --git a/aosp/frameworks/av/services/mediaextractor/main_extractorservice.cpp b/aosp/frameworks/av/services/mediaextractor/main_extractorservice.cpp
index f21574f218110515ea962204961b61b11144fd95..7ac2d3bfa26ad7d0a3b4115f8fa1856d5180b91a 100644
--- a/aosp/frameworks/av/services/mediaextractor/main_extractorservice.cpp
+++ b/aosp/frameworks/av/services/mediaextractor/main_extractorservice.cpp
@@ -32,15 +32,9 @@
 
 // from LOCAL_C_INCLUDES
 #include "MediaExtractorService.h"
-#include "minijail.h"
 
 using namespace android;
 
-static const char kSystemSeccompPolicyPath[] =
-        "/apex/com.android.media/etc/seccomp_policy/mediaextractor.policy";
-static const char kVendorSeccompPolicyPath[] =
-        "/vendor/etc/seccomp_policy/mediaextractor.policy";
-
 int main(int argc __unused, char** argv)
 {
     limitProcessMemory(
@@ -60,8 +54,6 @@ int main(int argc __unused, char** argv)
     //calling the function before entering minijail, we can force dlopen.
     android::report_sysprop_change();
 
-    SetUpMinijail(kSystemSeccompPolicyPath, kVendorSeccompPolicyPath);
-
     strcpy(argv[0], "media.extractor");
     sp<ProcessState> proc(ProcessState::self());
     sp<IServiceManager> sm = defaultServiceManager();
diff --git a/aosp/frameworks/base/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenMediaRecorder.java b/aosp/frameworks/base/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenMediaRecorder.java
index 1a9abb9cf27d493cd2f6e070c5058f54eb9b17f9..bee78c5c61770fbed0361f70ff8d1acde8027bb7 100644
--- a/aosp/frameworks/base/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenMediaRecorder.java
+++ b/aosp/frameworks/base/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenMediaRecorder.java
@@ -131,8 +131,8 @@ public class ScreenMediaRecorder {
                 * VIDEO_FRAME_RATE_TO_RESOLUTION_RATIO;
         mMediaRecorder.setVideoEncoder(MediaRecorder.VideoEncoder.H264);
         mMediaRecorder.setVideoEncodingProfileLevel(
-                MediaCodecInfo.CodecProfileLevel.AVCProfileHigh,
-                MediaCodecInfo.CodecProfileLevel.AVCLevel42);
+                MediaCodecInfo.CodecProfileLevel.AVCProfileMain,
+                MediaCodecInfo.CodecProfileLevel.AVCLevel41);
         mMediaRecorder.setVideoSize(screenWidth, screenHeight);
         mMediaRecorder.setVideoFrameRate(refereshRate);
         mMediaRecorder.setVideoEncodingBitRate(vidBitRate);
diff --git a/aosp/vendor/common/android/overlay/frameworks/base/core/res/res/values/config.xml b/aosp/vendor/common/android/overlay/frameworks/base/core/res/res/values/config.xml
index 12e4fc0adaab91b1aa14c87f5a1c35542275fb25..7218fec14533ce5186a26643684a214980667f12 100644
--- a/aosp/vendor/common/android/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/aosp/vendor/common/android/overlay/frameworks/base/core/res/res/values/config.xml
@@ -1,9 +1,14 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
     <!-- Package name providing network location support -->
+    <bool name="config_enableNetworkLocationOverlay" translatable="false">false</bool>
     <string name="config_networkLocationProviderPackageName" translatable="false">com.android.networklocation</string>
     <!-- Package name providing geocoder API support -->
+    <bool name="config_enableGeocoderOverlay" translatable="false">false</bool>
     <string name="config_geocoderProviderPackageName" translatable="false">com.android.networklocation</string>
+    <!-- Package name providing fused location support. Used only when config_enableFusedLocationOverlay is false -->
+    <bool name="config_enableFusedLocationOverlay" translatable="false">false</bool>
+    <string name="config_fusedLocationProviderPackageName" translatable="false">com.android.networklocation</string>
     <!-- Package name(s) containing location provider support. These packages will be auto-granted
          several permissions by the system, and should be system packages. -->
     <string-array name="config_locationProviderPackageNames" translatable="false">