Merge "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""" am: b67697cf38
am: b496699104

Change-Id: I4ad127ad793b1c154af8536b8b989aafd283e787