Merge pull request #1854 from marex/arm/master/atf-v2.0.1

Arm/master/atf v2.0.1