Prefer org.junit over junit.framework for OkHttp code.

Noticed a few out-of-place imports.

MockWebServer still uses old packages in a couple of places and I didn't touch those.