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