Merge "fs_config_dirs and fs_config_files miscalculates LOCAL_REQUIRED_MODULES"
am: d0020fafe2

Change-Id: I9af881f708c619e9da5b7b5204bbd58dd52d6195