Merge "Update layoutlib to match java library changes"