am 711b5584: am 105ef36c: Merge "Native tests are now multilib=both by default"

* commit '711b5584db13b6a2aca555e577c3d7cfb04946ab':
  Native tests are now multilib=both by default