Merge "Detect `uname -m` == i686 as a 32-bit host"