Merge pull request #4558 from gilles-peskine-arm/aria_alt-2.16

Backport 2.16: Fix ARIA_ALT header and self-test and CAMELLIA_ALT self-test