Merge "tests: Add test coverage for DirUtil." am: f24d2a6b39 am: 1b83e7e28d
am: 7f0f49dd2b

Change-Id: I2f4dbbb375894fe8695f99718401f2fcc457adb0