Merge "otautil: Clean up dirCreateHierarchy()." am: 610712101b
am: 5507c3d63c

Change-Id: I811f76004d8b0346746c25d05ee4b2fda635a352