Merge "Move resolv_test_utils into a library"