Merge "adb: optimize socket-list-walking code"