Merge "Revert "LayoutInflater: Special case well-known View constructors""