Merge pull request #333 from gilles-peskine-arm/psa-streamline_encodings-prepare_for_types

Streamline PSA key type encodings: prepare