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

Change-Id: I8210bbb66165da88aa3331a31f134f0088d9f01e