Merge "drm/msm/sde: Set VBIF Amem type during rotator hw config."