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

Change-Id: I3d4af7fd91105064bb1a91a59da30d13506db02f