am 3c0f4a28: (-s ours) Revert "DO NOT MERGE Fixing broken OkHttp CTS test"

* commit '3c0f4a28c5d5a98e15f9e9fc6a7c03bf459d5e14':
  Revert "DO NOT MERGE Fixing broken OkHttp CTS test"