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

Change-Id: I1a5ce06a6c6fed382b970ed13c495232b30b22a5