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

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