Merge "ART: Generalize "x >> (s & m)" simplification."