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

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