Merge "adb: switch apacket over to a std::string payload."