diff --git a/Android.mk b/Android.mk
index 6e57e81..879692e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -4,10 +4,12 @@
 
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
-LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4
-LOCAL_STATIC_JAVA_LIBRARIES += android-support-compat
-LOCAL_STATIC_JAVA_LIBRARIES += android-ex-camera2-portability
+LOCAL_STATIC_ANDROID_LIBRARIES := \
+    android-support-v13 \
+    android-support-v4 \
+    android-support-compat
+
+LOCAL_STATIC_JAVA_LIBRARIES := android-ex-camera2-portability
 LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit
 LOCAL_STATIC_JAVA_LIBRARIES += glide
 LOCAL_STATIC_JAVA_LIBRARIES += guava
@@ -21,27 +23,14 @@
 	$(LOCAL_PATH)/res \
 	$(LOCAL_PATH)/res_p
 
-
 include $(LOCAL_PATH)/version.mk
+
 LOCAL_AAPT_FLAGS := \
         --auto-add-overlay \
         --version-name "$(version_name_package)" \
         --version-code $(version_code_package) \
-        --extra-packages android.support.compat \
-        --extra-packages android.support.mediacompat \
-        --extra-packages android.support.coreui \
 
-ifeq ($(TARGET_BUILD_APPS),)
-    LOCAL_RESOURCE_DIR += \
-        frameworks/support/compat/res \
-        frameworks/support/media-compat/res \
-        frameworks/support/core-ui/res
-else
-    LOCAL_RESOURCE_DIR += \
-        prebuilts/sdk/current/support/compat/res \
-        prebuilts/sdk/current/support/media-compat/res \
-        prebuilts/sdk/current/support/core-ui/res
-endif
+LOCAL_USE_AAPT2 := true
 
 LOCAL_PACKAGE_NAME := Camera2