diff --git a/Android.mk b/Android.mk
index 394f09e6..bddca8fe 100644
--- a/Android.mk
+++ b/Android.mk
@@ -14,13 +14,15 @@ LOCAL_PRIVATE_PLATFORM_APIS := true
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
-LOCAL_STATIC_JAVA_LIBRARIES := \
+LOCAL_STATIC_ANDROID_LIBRARIES := \
     android-support-v4 \
     android-support-v7-appcompat \
     android-support-v7-preference \
     android-support-v7-recyclerview \
     android-support-v13 \
-    android-support-v14-preference \
+    android-support-v14-preference
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
     libphonenumber \
     org.lineageos.platform.internal \
     org.lineageos.platform.sdk
@@ -29,7 +31,8 @@ LOCAL_JAVA_LIBRARIES := \
     telephony-common
 
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-LOCAL_AAPT_FLAGS := --auto-add-overlay
+
+LOCAL_USE_AAPT2 := true
 
 include frameworks/opt/setupwizard/navigationbar/common.mk
 include frameworks/opt/setupwizard/library/common-gingerbread.mk