Merge "Revert "Delete layoutlib legacy""