Preparing for OP-TEE 4.2.0