Merge "adb: fix directory creation logic."