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

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