Merge "Bring back old constructor for layoutlib."