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

Change-Id: I2e0212c60a288acf0369f1ac0fd20d6124c88618