Merge "Fix Harmony's HostnameVerifierTest breakage."