Merge "Add files to CleanSpec.mk"