Merge "ART: Fix SimplifyInduction for an instruction with HEnvironment." am: d335e7b4d0
am: cf395df6cc

Change-Id: I0bb29e38d4dd8fb8b5722852b92d827b204f2ca6