Merge "ART: Fix x86_64 entrypoint breakage with SYMBOL()."
am: 0585afa3ba

Change-Id: Icb7d7d3a74165f2802d2f2feeaa4f84aad239e38