[automerger skipped] Merge "Add filegroup for supporting apache-http stubs generation." am: 828f14d58a
am: 25a088a857 -s ours
Change-Id: I2dd9118d2c6ca912ce6271f966989292f638ece0
This commit is contained in: