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

Change-Id: Ida277d532ddbb79bdbd44d98d2ec1e3cb8be54e9