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

Change-Id: I57bc57e60f654471d92271796b6e099b544760fd