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

Change-Id: I065826c95fd835e79ed90dda6cbe8086624eb1a4