sync with caf

Change-Id: I7dc0316f5a5cb555ed348bfff2d19d11739c54d2
(cherry picked from commit 352adf452adbe4c50db12751615ed31ac9591a36)

Conflicts:
	drivers/video/msm/msm_fb.c
1