Merge "Fix some clang warnings in SurfaceFlinger.{h, cpp}" into main