Merge "Move buildXXXPacket methods into TetheringTester"