Merge ""Revert^4 "Remove unused code for patching oat files.""
am: 3254104ced

Change-Id: I1b7dea8c53a77ec14ca15983b1c66a4a13078f5f