[automerger skipped] Move TapPacketReader into its own utility class. am:...
[automerger skipped] Move TapPacketReader into its own utility class. am: 3e814f79 am: 86927ac5 am: dd2b499b am: 64cb5530 -s ours
am skip reason: Change-Id I73e9c1919956aa665a8cccec11d3444e486426ec with SHA-1 3e814f79 is in history
Change-Id: I2e8c911198e6ae9d4c9219afac79f605f63d98e8