Merge tag 'optee-cleanup-for-v6.8' of https://git.linaro.org/people/jens.wiklander...