am 6184d1f7: am 4546520c: Merge "Move __adb_error to std::string, and improve various errors."

* commit '6184d1f739b9b064e9b2ccfe059afc624f0e2bfa':
  Move __adb_error to std::string, and improve various errors.