Merge "msm_fb:display: Fix compilation errors when DTV is disabled" into msm-3.0