Merge "ART: Enable scalar loop peeling and unrolling." am: 8467030520
am: 02ba9bee55

Change-Id: I4f6f67b80d1d7b37535eae8e52da9f4a1b5054ca