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

Change-Id: I1a4504b25b189d984f29aaf2b350a473679d1a2e