am a0b0ba04: Merge "X86_64: Fix core.oat compilation issues"

* commit 'a0b0ba04bd733d487dfe5b443dbc72894d63a46a':
  X86_64: Fix core.oat compilation issues