Android httpclient is fixed at 4.0-beta1. Use an upgraded client in a different namespace.

Use a renamed library to upgrade to a modern httpclient on android.

This solution works (and passes tests) on both Android and the JDK.