Merge "ART: Fix Mac-specific things in x86-64 assembly"