Merge "apache-http: Fix stubs generation."