Merge changes I87a57825,I3721d163 into oc-dev

* changes:
  SurfaceFlinger: Fix final cropping of child layers.
  SurfaceFlinger: Update parent pointer while performing transaction.