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

Change-Id: I312c7e60ef87dc2f400c992754e4093edfe300ee