Merge "otautil: Delete dirUnlinkHierarchy()." am: 031661d4a9
am: 993cec5cc9

Change-Id: Iec927cd9ff2f85e898fa034239641e733e119a49