am 180e08a7: am 3625af96: Merge "Error correction: Add a tool for en/decoding files"

* commit '180e08a70c546a2e72914ec329f7e989975e5811':
  Error correction: Add a tool for en/decoding files