Merge "adb: Fix missing shell protocol usage."