Merge "Add builders to luci configs"