[automerger skipped] Move TapPacketReader into its own utility class. am:...
[automerger skipped] Move TapPacketReader into its own utility class. am: 3e814f79 am: 86927ac5 -s ours am: 7e90c270 -s ours
am skip reason: Change-Id I73e9c1919956aa665a8cccec11d3444e486426ec with SHA-1 3221500b is in history
Change-Id: I705512301286c1d75372a958f57fc0caf9fbcadb