GitLab

This reverts commit aae2e51f.

Split the support library out of core-tests so the frameworks tests
don't go over the method limit.

Change-Id: Ib177a41b9965f213d325964e9723bfdfba2c5b99