Merge "adbd: fix spurious failure to create dirs when pushing."