am f27f1cc1: am 8ffa52af: am 1df73c5b: am 7a92c26e: (-s ours) am 6f5709ca: am de13095d: Update tests per new layoutlib_api [DO NOT MERGE]

* commit 'f27f1cc1247d349095687eb03c96b8e583bfe332':
  Update tests per new layoutlib_api [DO NOT MERGE]