tree cf2d3aac0c6a9fdb0d09d8da9de3879551956150
parent abc270f6afead17508022ee6d8607d6d78727568
parent 03ea7a9c598c7d32e3fe70117d67727b6c57a918
author Nan Zhang <nanzhang@google.com> 1523647364 -0700
committer android-build-merger <android-build-merger@google.com> 1523647364 -0700

[automerger skipped] Merge "Migrate apache-http stubs generation to Soong." am: 6bf56852e7 am: c3a3499c28  -s ours
am: 03ea7a9c59  -s ours

Change-Id: I3e4a2ea74c25aa8d90fd1f42151fb3ce5cf75431