Merge \\"Detect \\`uname -m\\` == i686 as a 32-bit host\\" am: 55d4a46f6d
am: db9f3489bc

Change-Id: Ia6e75590c95a7e670f977a33b540b76f8b995af8