am de13095d: Update tests per new layoutlib_api [DO NOT MERGE]

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