Upgrade to OkHttp 1.6.0

This upgrades both drivers/okhttp and mockwebserver.  Changelog:

https://github.com/square/okhttp/blob/master/CHANGELOG.md
Consistently use Square's mockwebserver

Google mockwebserver merged into OkHttp as per:

https://code.google.com/p/mockwebserver/