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

Change-Id: Ibf30daac71377734aa5f141a52ca032e122db05e