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

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