am f57c1388: Merge "SurfaceFlinger: fix layer removal race condition" into ics-mr1

* commit 'f57c1388860486a70cc773f2cfeaa3ea3b38a473':
  SurfaceFlinger: fix layer removal race condition