am c398b058: Merge "ART: Fix assembler_thumb_test"

* commit 'c398b0580fc7a7be768dcd6786d5ab6e7a892c9e':
  ART: Fix assembler_thumb_test