Merge pull request #1908 from soby-mathew/sm/update_ver

Update TF-A version to 2.1