Merge "adb: fix host-side serial number parsing for IPv6." am: b1c4d90215 am: 94c652ed31 am: dde69001c2
am: 5cab7cc637

Change-Id: I425b06ae91e657647878350319a242052c9959f2