Merge "SurfaceFlinger: Stop using IGBC::BufferItem"