Merge "Switch ahat test to use core-optimizing-pic.art."