Merge "Create new layoutlib-legacy to be included in the SDK"