Merge "Fix the CTS build now that core is gone"