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

* commit '4546520c81c8ff02469678dfc235614bf31324c1':
  Move __adb_error to std::string, and improve various errors.