Merge "core: Move core.oat bootjar definitions into core/config"
am: 5e1aa20225

Change-Id: Iede6a5ad12024e083accede4757a4be33d678aee