am 2ceb310d: am 5bc625d8: am a62a18e3: am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev

* commit '2ceb310d09a865c56145ba8b5d643a11a7ad2ce5':
  Fix layoutlib tests.