surfaceflinger: Fix a couple of mergefails

Change-Id: I2ba25281bfd2c991f07623a200152df019b0b8c9