Merge "SurfaceFlinger: Fix destruction of relatively Z-ordered layers." into oc-dev am: edcc0c28f4
am: 6fa90b1577

Change-Id: Iaf67f4476864bf9d1a012991be366186706b9be4