am d7fe69ba: Merge "ART: Fix host test failure (assembler_thumb_test)."

* commit 'd7fe69baee699ef1c9ec17f95b2d4f2522f03557':
  ART: Fix host test failure (assembler_thumb_test).