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

Change-Id: Ia92eb6fb96ff972d1398eb6790a040fa6b42bec1