MB-8102:  resurrect 1.8.1 builders

Change-Id: I91817dcd3a3ad0c67dfcddbf9831dc632e7d5e58