Merge "Add filegroups used in api-stubs generation."