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

Change-Id: Ia2b82d613c68dd4bfaa34f159216ffcd860f8d08