Merge "Add LOCAL_RESOURCE_DIR in Settings makefile"