Minor: indent, refactor
Move XForms filter to Scala, ProGuard, and jarjar