am 7ff339ea: Merge "uncrypt: Switch to C++"

* commit '7ff339ea1b36d46439e9255364cd9a4b2e73719a':
  uncrypt: Switch to C++