Ideally the module branch would be unbundled and contain no framework code or framework tests. Start by disabling the tests (which are not run in this branch anyway) as they depend on test utils that are updated in the module projects, but cannot be kept in sync as the latest tests verify platform behavior that does not exist in the module branch. Test: m Bug: 166414751 Change-Id: I96f217663b073ada40710c0c8cdcb39b775eef55