Merge changes Ie2df1f34,Ia906a7f0

* changes:
  surfaceflinger: use std::vector for mDisplayEventConnections
  surfaceflinger: use std::queue for mPendingEvents