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

Change-Id: I707398613a8aaf095945899f56ac3eb2e13a215b