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

Change-Id: I5157f2e2a08dc61e22568d2754f5384c21cc86e4