Merge "adb: switch asocket::enqueue to std::string." am: 9bf624cd3a am: e523a6c94f
am: 16bbf3b4cd

Change-Id: Ie46218fe0fff30999f1ca40c509bb7e27fe2cb42