Tweak app makefile with extra resources

Test: mmma packages/apps/Car/LensPicker/
Bug: 30240339
Change-Id: I2d2d8e83886d3c86c4d56561ae0568fc0e7dc890
diff --git a/Android.mk b/Android.mk
index 1827ed5..cc70ded 100644
--- a/Android.mk
+++ b/Android.mk
@@ -21,7 +21,8 @@
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-LOCAL_RESOURCE_DIR += frameworks/support/design/res
+LOCAL_RESOURCE_DIR += $(SUPPORT_LIBRARY_ROOT)/core-ui/res
+LOCAL_RESOURCE_DIR += $(SUPPORT_LIBRARY_ROOT)/design/res
 
 LOCAL_PACKAGE_NAME := CarLensPickerApp
 
@@ -37,7 +38,7 @@
 
 # Include support-v7-appcompat, if not already included
 ifeq (,$(findstring android-support-v7-appcompat,$(LOCAL_STATIC_JAVA_LIBRARIES)))
-LOCAL_RESOURCE_DIR += frameworks/support/v7/appcompat/res
+LOCAL_RESOURCE_DIR += $(SUPPORT_LIBRARY_ROOT)/v7/appcompat/res
 LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.appcompat
 LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-appcompat
 endif