am 296a7dc6: Merge "Add OatFileManager"

* commit '296a7dc68449fb49d47bf2cb93f1ed469bc3228b':
  Add OatFileManager