am 33c16932: Merge "Fix builds on archs the compiler does not support."

* commit '33c1693244996102c3aa37d2f54e02220d77f62b':
  Fix builds on archs the compiler does not support.