Merge "Add test-scheduler dir to verity"