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

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