Update layoutlib following Changes I2500bd4c and If456266f

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