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

Change-Id: Ic40bef2b672597ad00b4b106410c4347b556998b