Merge "Fix failures when eng_dyn scans multiple directories"