am 4cdf4508: (-s ours) Fix oatwriter code deduping

* commit '4cdf4508903d13fd0f9fba5690aeac1b368db81b':
  Fix oatwriter code deduping