Merge "Modernize requirements for platform-default HostnameVerifier."