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

Change-Id: I1255ff4ef6234b61996e6f7c8dfb86c890e4268e