Update layoutlib following Changes I7cf390d9 and I65e220ac

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