am 59982b51: am 2261d465: Merge "Clean up OatFile."

* commit '59982b51cff1bf817cc91e19997b774ce10deebb':
  Clean up OatFile.