Merge "Revert^2 "Package dexpreopt artifacts for libcore jars in the ART apex.""
am: 98774cfe5d

Change-Id: Ia81f962400208e49b6a46197610f21ece61670a0