surfaceflinger: Fix merge issue

Change-Id: I8d150a791bdd6b2e369a6279fe8e8b2cf240f476
Merge "surfaceflinger: Fix merge issue" into android-4.4