Merge "Revert "surfaceflinger: clear HWC layers in Layer::onRemoved"" into oc-dev