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

* commit '01f9ad1c671f0b14554ce6ccec10f34e86a49a2a':
  Fix layoutlib tests.