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

Change-Id: If51dceb9b5cb892601eb8ec14b5d4b4c09f5288d