MB-8652:  new builder names for new platforms

Change-Id: Ia747aa428bb2bfadf7397f29af033d27b184511e