Merge "Add custom config XML support for checkstyle" into nyc-dev am: f98b371
am: 5baa0bf

* commit '5baa0bf5444cb8ede35aad5ae929e1dfe50eb64c':
  Add custom config XML support for checkstyle