Revert "Refactor oat file writing."
am: 50c812abbe

Change-Id: I9f885f4dc4c93db048ebfbeb8b38123bf18ee7dd