Merge "adb: fix mkdirs test."