Merge ""Revert^4 "Remove unused code for patching oat files.""