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

Change-Id: Id33223b90f97a25a8453a45dbe4bc5e29267a56c