Merge "Fix compilation after update to MockWebServer"
Neil Fuller [Mon, 27 Oct 2014 11:02:26 +0000 (11:02 +0000)]

Trivial merge