am 4cf97c91: am 7bfe7b5b: am 5cca30a4: Merge "Revert two changes to LinearLayout measurement" into mnc-dev

* commit '4cf97c915a3a1bb88fec3a99beee5675ae35acfe':
  Revert two changes to LinearLayout measurement