Switched to new versions of netty and tcnative

components/cronet/android/test/src/org/chromium/net/Http2TestServer.java

Index: components/cronet/android/test/src/org/chromium/net/Http2TestServer.java
diff --git a/components/cronet/android/test/src/org/chromium/net/Http2TestServer.java b/components/cronet/android/test/src/org/chromium/net/Http2TestServer.java
index 57ba70ff01150cfbef8017bf11e4dacfd453765e..2f2f9835d87b6bb528fc4d41d1699743834c306f 100644
--- a/components/cronet/android/test/src/org/chromium/net/Http2TestServer.java
+++ b/components/cronet/android/test/src/org/chromium/net/Http2TestServer.java
@@ -104,7 +104,7 @@ public final class Http2TestServer {
             Context context, String certFileName, String keyFileName) throws Exception {
         new Thread(
                 new Http2TestServerRunnable(new File(CertTestUtil.CERTS_DIRECTORY + certFileName),
-                        new File(CertTestUtil.CERTS_DIRECTORY + keyFileName)))
+                        new File(CertTestUtil.CERTS_DIRECTORY + keyFileName + ".pkcs8.pem")))

[mef, 2017/04/27 15:49:15]

Is this new format needed because Netty doesn't like the normal one?
Should we change caller to pass file name with ".pkcs8.pem"?

[kapishnikov, 2017/04/27 16:40:09]

Yes, netty requires PEM pkcs#8 format. It doesn't like pkcs#1. I think it is a
good idea to change the callers. There are 4 callers currently. All of them rely
on QuicTestServer.getServerCert(). I don't want to change QuicTestServer because
it has nothing to do with that.

Currently QuicTestServer defines a constant with the cert file name. We could do
something similar in Http2TestServer but it removes the flexibility of passing a
custom cert, which may be useful in the future.

                 .start();
         sBlock.block();
         return true;