Merge "Revert "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""""