Merge "fs_config_dirs and fs_config_files miscalculates LOCAL_REQUIRED_MODULES" am: d0020fafe2
am: 151e856015

Change-Id: I6aae6d254471f48c1af0ce80c58ac890831c49fe