Merge "Revert "Remove OatFileAssistant::MakeUpToDate and friends.""