Merge "Revert "Reduce core image to core-{oj,libart,simple}.""