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

Change-Id: I8a1e49bc6036dab29d439cf79d7dcb4c5d2036ff