Merge pull request #4557 from gilles-peskine-arm/aria_alt-2.x

Backport 2.x: Fix ARIA_ALT header and self-test and CAMELLIA_ALT self-test