Merge "Make TypedArray and LayoutInflater exceptions more useful"