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

* commit '360ac6f5610598eb6a841f285a3c42dc72198475':
  Fix layoutlib tests.