Merge "msm: ADSPRPC: Use module specific class name"