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

Change-Id: Ia6d3700b16680adae040ce53367f677f3787d0e7