Merge "Disambiguate memory accesses in instruction scheduling" am: 640fbdc751
am: c1dbf10041

Change-Id: I5efbdbd5eb4d009fdc6b3fffaa8de25acd6b19f9