Merge "Layoutlib changes to support the new ResourceUrl"