am d8b571b2: Merge "Fix failures when eng_dyn scans multiple directories"

# Via Gerrit Code Review (1) and Kenny Root (1)
* commit 'd8b571b2dff2347770a7e8e5f9ea031d367dff52':
  Fix failures when eng_dyn scans multiple directories