[GIT PULL] OP-TEE cleanup for v6.8