Merge "ART: Fix underflow in codegen"