am c34f37c7: Merge "Allow to opt out both multilib in native test."
am c34f37c7: Merge "Allow to opt out both multilib in native test."

* commit 'c34f37c7b5d26e58a9666fc277379111a7c2ea4f':
  Allow to opt out both multilib in native test.

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build