Merge "Stopgap fix for layoutlib." into lmp-preview-dev