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

* commit 'aa5786e8aede3530ed22780461018c6f885d54af':