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

Change-Id: I3a5adbb7d5c3b8ec552934d898fbb1c2c41f2cfb