Merge "msm: pil: Differentiate header guards" into msm-3.0