Merge "Allow building on clang without __builtin_assume_aligned"