Merge "Add filegroups used in api-stubs generation." am: 353da92a1f
am: e7ca67fdf6

Change-Id: Ic2cc5a9d350f27857169d2e80c534f8e4686210a