Merge "core: Move core.oat bootjar definitions into envsetup.mk" into oc-dev-plus-aosp am: caa917ae3d
am: 5f5daa504e

Change-Id: I07a833d36a85df323e343cb8c6e0e11dc98132d3