surfaceflinger: Fix more merge issues

Change-Id: I6dc5f30990f3aaf7cafe84be6c664da1a0fc11e8