Revert "services: surfaceflinger: ASAN fix" am: 598f6d5429
am: d5156b70ff

Change-Id: I35366694c5518390d49d803806955fc85bfc34f2