Update layoutlib following Change Ia12d448a

Test: layoutlib tests
Change-Id: I66632bcef3a05d3d89e7fc6a37f099100feed0ad
2 files changed