Merge "Revert "Disable load/store elimination. DO NOT MERGE"" into lmp-dev-plus-aosp