Merge "Revert "core: Move core.oat bootjar definitions into core/config""