Revert "Fix multi-arch build for x86"

This reverts commit 08b004c9938a06bea32288a4b4e40127887ff682.

Change-Id: Ie12a9965554d5cd1d2c2f89d18c7952e155cff98
1 file changed