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

Change-Id: I92454274470675dbe533c0713d44c304f0cfaaf0