Merge "otautil: Clean up dirCreateHierarchy()." am: 610712101b am: 5507c3d63c am: 0863373376 am: 06db7363b0
am: cee984b929

Change-Id: Ia4fbd8f6bbfcc4fe51488b65cfe2b826564119f5