am f607fa6b: am d38cc749: Merge "Avoid bug in LinearLayout measurement" into lmp-mr1-dev

* commit 'f607fa6b73019998588e613aa2ae8ee97958cee7':
  Avoid bug in LinearLayout measurement