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

Change-Id: I4eabbdfdbef717be9131a75602cf6452e1af4855