Merge "adb: mkdirs fixes"