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

* commit '105ef36c67baeebd2fd9c24b6140953afba4f160':
  Native tests are now multilib=both by default