Merge "core: Move core.oat bootjar definitions into envsetup.mk"