Merge "Cleanup packages/Tethering/common/TetheringLib"