Merge "otautil: Delete dirUnlinkHierarchy()." am: 031661d4a9 am: 993cec5cc9 am: 633aeba594 am: 9c62f67863
am: e3134ff774

Change-Id: I50e5fb1af1d4a594ae9f579c550972781a3ab5da