Merge "Keep oat file unique pointers until they are no longer used."
am: 5987549ea9

* commit '5987549ea901df16dbe181336ed0658bf2732bc7':
  Keep oat file unique pointers until they are no longer used.

Change-Id: I82f55e6676727df3b35f3f8cca6bc6326f8a28a2