Merge "msm: display: remove framebuffer memory associated with fb1 and fb2" into msm-3.0