Fix Merge Derp for "ADB over network"