Merge "Fix resource type annotations for obtainStyledAttributes"