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

Change-Id: I563dae11c7815413e48563a1eb07ac341da39e55