Merge "Fix repo script to ignore tools"