Merge "apache-http: Fix stubs generation."
am: ba5d8abcbe

* commit 'ba5d8abcbe2dd9d3af8b83a1b24e9ae8dd841cb7':
  apache-http: Fix stubs generation.