Merge "Add filegroup for supporting apache-http stubs generation." into pi-dev-plus-aosp