Merge "msm: pil_riva: Combine SSR and PIL drivers"