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

Change-Id: Id4f9e3e820444c69e1c2bb2d13a813f6cc14a711