Merge "msm: spm-v2: Add support for AVS"