Merge "adb: Avoid extra string construction" into rvc-dev