Merge changes Ia84ed9ec,I1c0fde72

* changes:
  fastboot: Avoid extra std::string copies
  adb: Avoid extra std::string copies