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

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