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

* commit '03e6f710bc5263cbaf53149dac1d7f775a9ab051':
  Limit adb_test to first multilib