Merge "Update layoutlib following Changes I7cf390d9 and I65e220ac"