Merge pull request #1797 from antonio-nino-diaz-arm/an/remove-smccc-v2