Merge "Native tests are now multilib=both by default"