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

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

Change-Id: Ic96fa50657923f3c93c7cabf1bbf3abecee3c39f