Merge "Add filegroup for supporting apache-http stubs generation."