Merge "ART: Fix test 117 after OatFileAssistant change"
am: fda30a435d

* commit 'fda30a435d672988c3ec1805905b359a5e756bf3':
  ART: Fix test 117 after OatFileAssistant change