Merge "Remove bogus apache-http dependency."