Merge "Replace layoutlib with the legacy version"