Merge "Revert "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"""" am: 50a39ba9a9
am: c307426ebe

Change-Id: I3888d6a447a5b9ea588ee0e93c4c0f91626f1b70