Merge "Fixed issue where XmlPullParserExceptions are thrown with Theme defined GradientDrawable attributes"