am e572a77f: am fa36b36c: Merge "Deprecate more apache-http." into lmp-mr1-dev

* commit 'e572a77f05948fdc9c17ccdce0784d8b179a03ee':
  Deprecate more apache-http.