Merge "msm8926: add skug subtype support"