Merge "surfaceflinger: discard stale commands" into oc-dev
am: f8ca9a0875

Change-Id: I6b7ce1798d2fe753c577ff3baa954283c372b80c