Merge change Iae493184 into eclair

* changes:
  Minor fix for the parent style computation in the layoutlib.