Merge "adb: properly calculate packet size on Mac." am: ee63d74b6c
am: 994a47cc98

Change-Id: I61aa194b43d50625edf3b8be84f65b5a2dbef709