diff --git a/Apps/Android.mk b/Apps/Android.mk
index 7b97f43dcf38215cc188f82db89b55a2d3063d84..f4eb0f1b32cdc337246dbc67918419d3270efec7 100644
--- a/Apps/Android.mk
+++ b/Apps/Android.mk
@@ -6,4 +6,8 @@ LOCAL_CERTIFICATE := platform
 LOCAL_SRC_FILES := AppLounge-2.3.4-release.apk
 LOCAL_MODULE_CLASS := APPS
 LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
+ifneq ($(call math_gt_or_eq, $(PLATFORM_SDK_VERSION), 31),)
+LOCAL_OPTIONAL_USES_LIBRARIES := androidx.window.extensions \
+                                 androidx.window.sidecar
+endif
 include $(BUILD_PREBUILT)
diff --git a/GmsCore/Android.mk b/GmsCore/Android.mk
index 264e894816b2f6dcc4a9b842ea7400657b1f9407..2698c93b4e2c512f8fd0afda82272f885227ac03 100644
--- a/GmsCore/Android.mk
+++ b/GmsCore/Android.mk
@@ -27,4 +27,7 @@ LOCAL_CERTIFICATE := platform
 LOCAL_OVERRIDES_PACKAGES := com.qualcomm.location
 LOCAL_REQUIRED_MODULES := privapp-permissions-com.google.android.gms.xml
 LOCAL_REQUIRED_MODULES += microg.xml
+ifneq ($(call math_gt_or_eq, $(PLATFORM_SDK_VERSION), 31),)
+LOCAL_USES_LIBRARIES := com.android.location.provider
+endif
 include $(BUILD_PREBUILT)
diff --git a/MagicEarth/Android.mk b/MagicEarth/Android.mk
index fa0299f3875c0e6074731e446fbb142e813efbae..04a2a701f69f1593ffa61c35c81271d58e7fd637 100644
--- a/MagicEarth/Android.mk
+++ b/MagicEarth/Android.mk
@@ -8,6 +8,9 @@ LOCAL_MODULE_CLASS := APPS
 LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
 LOCAL_CERTIFICATE := PRESIGNED
 LOCAL_REQUIRED_MODULES := libMagicEarthNative.so
+ifneq ($(call math_gt_or_eq, $(PLATFORM_SDK_VERSION), 31),)
+LOCAL_OPTIONAL_USES_LIBRARIES := com.sec.android.app.multiwindow
+endif
 include $(BUILD_PREBUILT)
 
 ifeq ($(TARGET_ARCH), $(filter $(TARGET_ARCH), arm64))
diff --git a/Mail/Android.mk b/Mail/Android.mk
index 5204574abb9e41d52429da95d9d10d2996fe8985..3b3d654d70ff79e75f6f6dcd69a5ec2f1f2382a6 100644
--- a/Mail/Android.mk
+++ b/Mail/Android.mk
@@ -4,8 +4,12 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := Mail
 LOCAL_OVERRIDES_PACKAGES := Email
 LOCAL_CERTIFICATE := platform
-
 LOCAL_SRC_FILES := k9mail-release-unsigned.apk
 LOCAL_MODULE_CLASS := APPS
 LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
+ifneq ($(call math_gt_or_eq, $(PLATFORM_SDK_VERSION), 31),)
+LOCAL_OPTIONAL_USES_LIBRARIES := com.sec.android.app.multiwindow \
+                                 androidx.window.extensions \
+                                 androidx.window.sidecar
+endif
 include $(BUILD_PREBUILT)
diff --git a/com.google.android.maps/Android.mk b/com.google.android.maps/Android.mk
deleted file mode 100644
index a1ce9930bc6b71a2f32a20653e35f83ff456da8b..0000000000000000000000000000000000000000
--- a/com.google.android.maps/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := com.google.android.maps.xml
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/permissions
-LOCAL_SRC_FILES := com.google.android.maps.xml
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := com.google.android.maps.jar
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-LOCAL_SRC_FILES := com.google.android.maps.jar
-LOCAL_PACKAGE_NAME := com.google.android.maps.jar
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_REQUIRED_MODULES := com.google.android.maps.xml
-include $(BUILD_PREBUILT)
diff --git a/com.google.android.maps/com.google.android.maps.jar b/com.google.android.maps/com.google.android.maps.jar
deleted file mode 100644
index 3779c7769705f7b067d4247b62f9001c2934158d..0000000000000000000000000000000000000000
Binary files a/com.google.android.maps/com.google.android.maps.jar and /dev/null differ
diff --git a/com.google.android.maps/com.google.android.maps.xml b/com.google.android.maps/com.google.android.maps.xml
deleted file mode 100644
index 5be5c2ce13e4e14ced45e88698d8c8243e099277..0000000000000000000000000000000000000000
--- a/com.google.android.maps/com.google.android.maps.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<permissions>
-    <library name="com.google.android.maps"
-            file="/system/framework/com.google.android.maps.jar" />
-</permissions>