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

Change-Id: If3194f38141d639ad5f80cff317aa00689cb8c9a