Stop using apache-http in settings.

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

bug: 18027885

(cherry picked from commit f25627c0)

Change-Id: I62b0c4e79812ae69767d778eb9e866cbba1d50e0