Merge "surfaceflinger: fix static analyzer complaints" am: 6d31f4eb4a am: 72e782036d am: 1719e70b04
am: 94ffdb2918

Change-Id: Ib58556f53240baf86621f3fda651cf62c17c85aa