Merge "Enable checkstyle for other non-source files"