Merge "ART: Special-case cb(n)z even for in-reg constant"