Revert "Switch to CMs 'okhttp'"

This reverts commit b1c7fc665a48a40cbce2fd5beecce46ccd85b391.

Change-Id: I30ab02242e905b3630645201bffd7b437e773edd