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

Change-Id: Ic7fbfdccd87cace5b0e1d10a1548605df7ffa845