Merge "adb: Avoid a couple std::string constructions"