Merge "otautil: Delete dirUnlinkHierarchy()."