am e86e5b27: am 89bfb2be: Merge "Fix test-art-target-oat for multi target"

* commit 'e86e5b2752c7ab6b2b2c42e64c910abc5fd11fea':
  Fix test-art-target-oat for multi target