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

Change-Id: If1ec447b21e277a023b016868db1633379acc5e0