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

Change-Id: I78b9c353b201b43888d469a6aa8919b2e1809f5c