Merge "Revert^3 "Package dexpreopt artifacts for libcore jars in the ART apex."" am: d4f1febbc3
am: a4cc733b17

Change-Id: I6a5e7c00771a8461500394becbb8e6288ea0dab9