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

Change-Id: I6d366d325fd951302c492e32248d0f6469999225