Merge "Separate tethering build target to Tethering and TetheringNext"