video: mdss: Update DT and cleanup after merge

Conflicts:
	drivers/video/msm/mdss/mdss_fb.h
	drivers/video/msm/mdss/mdss_mdp_overlay.c

Change-Id: I0b378216ccdc688af58c9995db91163a4ecc4b56