Merge "Remove OatFileAssistant::MakeUpToDate and friends."