Merge "Rename core/combo/arch/x86/x86-atom.mk to core/combo/arch/x86/atom.mk."