Merge "surfaceflinger: use std::vector for waitForEventLocked"