Use arch-specific flags to fix multilib build.

(cherry picked from commit fa6268cfac65636ae5aa8740ca9b3e5c4b77e1ca)

Change-Id: Ie11944529182f3ea0da19313474a843434efeed3
1 file changed