Merge "ART: Fix oat_test for 64b"