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