Merge "Merge "surfaceflinger: fix a potential child layer leak" into oc-dev am: 1b02b632 am: 989ed5c4" into oc-dr1-dev-plus-aosp