Merge changes I91a4be00,I07f4d4ab

* changes:
  SurfaceFlinger: Add ChildColorLayerTest with zero alpha
  SurfaceFlinger: Correct DetachChildren case in SFFakeHwc_test