Revert back to AOSP external/okhttp

Change-Id: If21b4e958e96f0e9d3cfe40eaa610e9d25f25ebe