Merge changes I3a839351,I51b58e9c into msm-3.0

* changes:
  video: msm: Update CONFIG_MHL condition
  video: msm: Add FB_MSM_HDMI_MHL to Kconfig