Merge "adb: Avoid extra string construction" into rvc-dev am: 386e91d21c am: ca79430600

Change-Id: I6f511a36450298fb19a8a3e35eb72361cac82fb0