Merge "qseecom: Fix compilation errors" into msm-4.9