Merge "ART: Fix CFI annotation in arm64, x86 and x86-64 assembly"