tree 436a3e05fe33dd4434d87b905d5b58823897385b
parent dbdc034e1c340018a576af751b849391e18a6175
author Ying Wang <wangying@google.com> 1458182687 -0700
committer Ying Wang <wangying@google.com> 1458937713 -0700

Allow x86+arm multilib build.

Bug: 27526885
Change-Id: I00f9da322e586b0de8ba62cd53427f7284e9fdbf
(cherry-pick from commit 1e1ff59eadf79dc114eeaece153a1f11e234cc21)