[TF-M] Re: Build failure of release/2.1.x