Merge "surfaceflinger: fix a potential child layer leak" into oc-dev am: 1b02b6329e
am: 4d5cc90559

Change-Id: Ib956b914044fee1941ef966bbf96c151bbbcf6a4