Merge "ART: Fix underflow in codegen"
am: 2666b11c0d

Change-Id: If0215f2716ad05474f9821d098a1d41e86f258b8