Merge "Fix libart tests on target" into nyc-dev
am: 89f4eb5d93

* commit '89f4eb5d93ffaf24ae237662df20aea9acd65ab0':
  Fix libart tests on target

Change-Id: Ide52a630ad1e5eb065392ef4db2bbe39442587ee