Merge "ART: Refactor scalar loop optimizations."
am: 85861e8095

Change-Id: Id8c73145bc2f8ff479e7366265d81858b1663e9e