Merge "Cronet: add test server"