Merge "ART: Fix 530-checker-peel-unroll after D8 update."