am ba9e1f42: Merge "SurfaceFlinger: Fix PTS on stale buffers" into mnc-dev

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