Merge "ART: Clean up x86 asm in dex cache entrypoints"