Merge "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"""
am: b67697cf38

Change-Id: Ic1a3e5d5bd2660b8ed71b0650672321480d60adb