Merge "surfaceflinger: fix -Wsign-compare warnings"