Merge "surfaceflinger: fix z-relative layer destruction" into oc-mr1-dev am: 11e66edfad
am: c8a1e48ea0

Change-Id: I01182bd305e160e057694151edcabf4c2d8fee8a