Merge change 5684 into donut

* changes:
  Fixes #1940605. MeasureSpec's mode and height were inverted in RelativeLayout.