Merge "USB: msm: Add support for CDC-ACM composition" into msm-3.0