am df3cd082: am 296a7dc6: Merge "Add OatFileManager"

* commit 'df3cd08294d94166ac39deb03193798c8944301b':
  Add OatFileManager