am a131bfe0: am 3dbd18cd: am 872e9950: am 1f8e3de4: Merge "More layoutlib tests." into lmp-mr1-dev

* commit 'a131bfe094c007721d006fc9ca21cfa74f41dfef':
  More layoutlib tests.