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