Merge "Fix assembly code for clang"