am f9ff3a27: am 91f23647: am 7fedf5d4: am 1c8107dd: am 5c380efa: Merge "Always distribute excess space in LinearLayout measurement" into mnc-dev

* commit 'f9ff3a27c6e6cdea7a0f05024de22bc2bad9312a':
  Always distribute excess space in LinearLayout measurement