am 6067d953: Merge change 5428 into donut

Merge commit '6067d953d7c6c0216a383fe520222fa6a23926fa'

* commit '6067d953d7c6c0216a383fe520222fa6a23926fa':
  Improve handling of FILL_PARENT in RelativeLayout.