Merge "Reinstate C++ KeyMint impl as default" into main