Move luci builder names to the up to date ones. am: e173798b89
am: 3272143c45

Change-Id: I2865f2e45e89e5b6baf535a64abedd538b2e5ba1