Merge "Fix oat_writer to use WriteData which updates checksum."