Merge "msm: media: Cleanup userspace exported headers' marking"