Revert "Changes associated with an OkHttp bad proxy response fix"
This reverts commit 467a6809.
commit 467a6809 is present in
lollipop-cts-dev but not lollipop-release. This causes the
tests to fail when run against a lollipop-release build.
DO NOT MERGE ANYWHERE
Bug: 22546532
Change-Id: I4582824e94679213f27352e18e7d9bb985954909