Merge "Revert "Layoutlib changes to support the new ResourceUrl"" into oc-dev