Merge "uncrypt: Switch to C++"