Merge changes from topic "sf-remove-remove-layer"

* changes:
  SurfaceFlinger: Remove removeLayer
  Fix memory leak in SurfaceControl#copyFrom