am 92a13f56: am 25a67fde: am 7ff339ea: Merge "uncrypt: Switch to C++"

* commit '92a13f5697228c6460bf740ccce4021b8a5e0bc8':
  uncrypt: Switch to C++