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

Change-Id: I3d59f6fe7851dfb59b99a73b9ffde187e29ab7b4