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