Merge "Fix builds on archs the compiler does not support."