am a5bfefb1: Merge "ART: Fix expectations for instruction-set-features string"

* commit 'a5bfefb1042dfd6b1338dba9287e21c7e432a61a':
  ART: Fix expectations for instruction-set-features string