Merge "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"" am: dabfd96c82
am: 32fbf4740d

Change-Id: I74ae067983820f52bf6c12a133b917a43695af9d