[automerger skipped] Merge "adb: Avoid extra string construction" into rvc-dev...
[automerger skipped] Merge "adb: Avoid extra string construction" into rvc-dev am: 386e91d2 -s ours
am skip reason: Change-Id Ie03062a17b98866f1bc419a7e509461cf4e6bb80 with SHA-1 030f1eff is in history
Change-Id: Icf23765de01466f5e56c05859e19d68e44c75a10