Merge "msm: qdsp5v2: Fix compilation error when early suspend is disabled" into msm-3.0