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

* commit 'f98b3710206d5fa58a8914bf05bf649cb85d1239':
  Add custom config XML support for checkstyle