Merge tag 'AU_LINUX_ANDROID_LNX.LA.3.5.2.2_RB1.04.04.04.087.034' into 12-12

AU_LINUX_ANDROID_LNX.LA.3.5.2.2_RB1.04.04.04.087.034 based on quic/aosp/LNX.LA.3.5.2.2_rb1

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

Change-Id: I48df7142b295da19454039ab33c6dc4be846d2e7