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

Change-Id: I192c21cb02a5a93672bd13340e9e9bc3ed795213