am 73d00e68: Merge "Use XmlPullParser.getEventType()"

* commit '73d00e68d8fcd64ce28fc5bed6881100a0fead9b':
  Use XmlPullParser.getEventType()