Merge "Refine OatFileAssistant.MakeUpToDate failure result." am: fd9ac38
am: 6adc6fe

* commit '6adc6fe4bcadccf2f2aaa6a6159e975dd93eb5f8':
  Refine OatFileAssistant.MakeUpToDate failure result.

Change-Id: If78fa58cc605f4999c966585225aa383c7447eec