Merge "X86_64: Fix core.oat compilation issues"