Merge "surfaceflinger: fix static analyzer complaints"
am: 6d31f4eb4a

Change-Id: I3ed3ca3f69e8a44232553afaaaed4c6cab6b3bfd