Merge "crypto: ccm - Remove VLA usage"