Revert^2 "Refactor oat file writing."
am: 0866ea41c2

Change-Id: I059dbccda461cf761de4232ee6e7b01fc3c1b781