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

Change-Id: I2c4228a1d5bff33ca2db3249e261f98054eb342e