Merge "Move Trusty C++ KeyMint to v4" into main