am 3a608f82: Merge change 5684 into donut

Merge commit '3a608f829b54a7653c9cc2b3bdbda0641cca37bb'

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