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

Change-Id: I1a41300d93477f008f6a8f9eca611b1985897c3d