am 990f4e7d: am 306cd217: Merge "ART: Blacklist relocate option in oat tests"

* commit '990f4e7d9d644956e8bdea7adf94a5b4a2786f6b':
  ART: Blacklist relocate option in oat tests