Use arch-specific variables This fixes x86+arm multilib build. Bug: 27526885 Change-Id: I06d11b33ed2fef027ff73dda9309b29d28dda6b6