Stop using apache-http in settings.

Most of this usage is from crufty "test" code, and is trivially
replacable.

bug: 18027885

Change-Id: If4441a5e76405eba068479a4dcaa6012b5a74cbf
Merge "Stop using apache-http in settings."
Merge pull request #1 from android/master

up to aosp