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

Change-Id: I3e4a2ea74c25aa8d90fd1f42151fb3ce5cf75431