am 678754e6: am be02a596: Merge "ART: Fix oat_test for 64b"

* commit '678754e6960521fbde16b36ea457499496b85a69':
  ART: Fix oat_test for 64b