Merge "Use a different arch feature indicator for clang"