Merge "Fix sanitizer in surfaceflinger waitForEvent."
am: a7b2ac212a

Change-Id: I542d981a6cf0d723038ddbeb643b9c84634e48de