Merge "Update HostnameVerifierTest for consistency with our new hostname verifier."