am 64367019: am c398b058: Merge "ART: Fix assembler_thumb_test"

* commit '64367019415286b11c7f3afada978462aefd8059':
  ART: Fix assembler_thumb_test