Merge "Revert "Use new test utilities from frameworks/libs/net""