Merge "Add builders to luci configs"
am: e0e49b9eb7

Change-Id: Id31218df5ad59b985d0604c2de88d677c86efa7d