Merge "tests: Add test coverage for DirUtil."
am: f24d2a6b39

Change-Id: I624cb64464427d06d2711f3b88ec94cd93ac06d3