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

* commit '25a67fde9fe5ebaeb79dbb3edf0fc4857adf5da2':
  uncrypt: Switch to C++