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

Change-Id: Ifb70b24a1b990ee86181acd09dae5ec7b8ccfa6e