Android n preview 1
Merge "apache-http: Fix stubs generation."