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

* commit 'dbb79ae9dc457bcb97794f718c6d3aa7fc4a19ca':
  Revert two changes to LinearLayout measurement