Merge "Improve LayoutInflater's compliance."