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

Change-Id: I87e368e8ee4770d02fbe75a031f01ff163e0c372