Merge pull request #1722 from antonio-nino-diaz-arm/an/arch

Synchronize architectural headers with TF-A-Tests