Merge "Revert "Cronet: add test server""