am a0162542: am bb58111c: Merge "SurfaceFlinger: Fix PTS on stale buffers"

* commit 'a0162542609b1dcd8158644e7ba5ae92e84b95d5':
  SurfaceFlinger: Fix PTS on stale buffers