Merge "crypto: ice: Fix compilation issues" into msm-4.9