Merge "Limit adb_test to first multilib"
am: 3fb7d97689

* commit '3fb7d9768974443b7832255b2419c3b0c162a8cb':
  Limit adb_test to first multilib