Merge "ART: Fix test 117 after OatFileAssistant change"