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

Change-Id: I520fff2e1cc9b3a49478cbc9e783df081defc75d