am 2261d465: Merge "Clean up OatFile."

* commit '2261d465990dd7d46496c074fde7349e9bacb79e':
  Clean up OatFile.