Merge "Update layoutlib following Change Ia12d448a"