Merge "Revert "Reattach OomAdjuster rewrite flag"" into main