Merge "Allow CompOS to use DICE from C++"