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

* commit '872e9950a227128d323c24eb369863e16964493a':
  More layoutlib tests.