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

Change-Id: I3e0b3d34cc3dbca46b96910fe0b656d6b07c03d9