am 6cd6792a: Merge "Allow building on clang without __builtin_assume_aligned"

* commit '6cd6792a3289c0c50542d8113068478dbc3a5ad0':
  Allow building on clang without __builtin_assume_aligned