Merge "Fix sanitizer in surfaceflinger waitForEvent." am: a7b2ac212a am: 8700fe4770
am: f03a7f8a5c  -s ours

Change-Id: I096d9fab87d0ef04c9d0e694947b52a1390c9bb0