Merge "Fix libart tests on target"
am: 3cbdfc6b08

* commit '3cbdfc6b0863a7419ec42f458c41c41bf2d155b1':
  Fix libart tests on target

Change-Id: If02797d607a6133781df618194e1cb6902404f1d