Merge "Fix dependency for fontchain_lint" into nyc-dev