Merge "[SurfaceFlinger] Remove unused functions." into qt-dev am: dde87c4a32
am: 9cdaff3690

Change-Id: I43747b4d955cf1f15efd9d84603d42b2d3c6e341