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

Change-Id: Ide20da61903dce4396a88a56c79ba34044354157