Preparing for OP-TEE 3.18.0