diff --git a/Android.mk b/Android.mk
index 8d43c85..a1d10ce 100644
--- a/Android.mk
+++ b/Android.mk
@@ -33,8 +33,7 @@
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res \
-        frameworks/support/design/res
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
 LOCAL_PACKAGE_NAME := LocalMediaPlayer
 
@@ -46,12 +45,15 @@
 
 include packages/apps/Car/libs/car-stream-ui-lib/car-stream-ui-lib.mk
 
-LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4 \
-        android-support-design \
+LOCAL_STATIC_JAVA_LIBRARIES += \
         car-stream-lib \
         LocalMediaPlayer-proto
 
-LOCAL_AAPT_FLAGS += --extra-packages android.support.design
+LOCAL_STATIC_ANDROID_LIBRARIES := \
+        android-support-v4 \
+        android-support-design
+
+LOCAL_USE_AAPT2 := true
 
 # Include support-v7-appcompat, if not already included
 ifeq (,$(findstring android-support-v7-appcompat,$(LOCAL_STATIC_JAVA_LIBRARIES)))