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

* commit '5bbc026536f460c90f17f4554bad554f72df0009':