Merge "Fix compilation after update to MockWebServer"