Merge "Remove unused code for patching oat files."