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

* commit 'd22b22b2adb673d464004c30704cc5f12323befb':
  ART: Fix oat_test for 64b