OkHttp 1.5: fold okio into okhttp.
Merge pull request #575 from square/okhttp_15_jwilson_hide_2x_apis

OkHttp 1.5: fold okio into okhttp.