Merge "Fix android.net.SSLTest"
am: ef43ea3238

Change-Id: If877193c05bf6b932aceacc93b27241e619a21b2