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

Change-Id: I9fc332c08682a1c519417e5bdd705060a5bbfdbc