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

Change-Id: I15d0066c612b16b2874859c6ceaf27fcf9f2d878