Merge "adb: make shell protocol work again."