am 9871afaf: resolved conflicts for merge of 525f2f30 to lmp-dev-plus-aosp

* commit '9871afafd29015856be3da4920809e77e1a1321b':
  ART: Make run tests out of oat tests