Merge "adb: fix shell_service_protocol_test for Windows."