Merge "More layoutlib testing infra fixes"