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

Change-Id: Ica0906d38bbf2df75f10a6108600c3c1646ab80d