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

* commit 'd38cc749215c0e41bcb06703066c379de83d91e4':
  Avoid bug in LinearLayout measurement