Merge "Fix invalid API use of XmlPullParser.getAttributeValue."