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

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