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

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