am 837261cc: Merge "Fix HttpResponseCacheTest in anticipation of an OkHttp upgrade."

* commit '837261cc997cbb188de05e3d1194adb91cb75825':
  Fix HttpResponseCacheTest in anticipation of an OkHttp upgrade.