Merge "resolv_unit_test: Use resolv_test_utils"