diff --git a/Android.mk b/Android.mk
index 023e0c0..d615547 100644
--- a/Android.mk
+++ b/Android.mk
@@ -10,6 +10,8 @@
         $(call all-java-files-under, src) \
         src/com/android/settings/EventLogTags.logtags
 
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+
 LOCAL_PACKAGE_NAME := Settings
 LOCAL_CERTIFICATE := platform
 LOCAL_PRIVILEGED_MODULE := true
@@ -18,9 +20,11 @@
 
 LOCAL_AAPT_FLAGS += -c zz_ZZ
 
+include frameworks/opt/setupwizard/navigationbar/common.mk
+
 include $(BUILD_PACKAGE)
 
-# Use the folloing include to make our test apk.
+# Use the following include to make our test apk.
 ifeq (,$(ONE_SHOT_MAKEFILE))
 include $(call all-makefiles-under,$(LOCAL_PATH))
 endif