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

Change-Id: Iddae1b7f6acf45da61a74622947153cf282e6a91