Merge "Remove OatFileAssistant::MakeUpToDate and friends."
am: fcfb4dd31e

Change-Id: I0f57eebf2fb0e911caabdea1393d8a18bb6b4282