Merge "core: Move core.oat bootjar definitions into envsetup.mk" am: 6cb7688e85 am: 692309c9f5  -s ours
am: 8748f92627

Change-Id: Ib83f76f8597cd9f858c8c7d7658917abbbfeb08b