Tidy up MockWebServer usage
am: 22bfef3e51

Change-Id: I616af023ea3580283e3c70105c08835bde6c5c09