Merge "Remove clang: true"