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

Change-Id: I1bd6af643810358d4ea8426338607c6f506dad72