Bring in apache-http

Change-Id: I6783334ed47d009e2c728b41442769b4b90bb1fc