Merge "Fix ARM assembler for clang."