Fix host multilib support.

This was kludged a bit to get 64 bit host builds working. This
cleans everything up so it all works properly.

Change-Id: Ic86b1ca1ef563902f71cb77c8d55a5d5b28b47b7
2 files changed