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

Change-Id: I04a8336ff7937ccc5722476f79bb46ee360a2ebf