Merge "Revert "services: surfaceflinger: ASAN fix"" into nyc-mr1-dev