Merge "remove TestTrafficControllerSetUp & TestSocketFilterSetUp"