Move to Muppets vendor again

Change-Id: I3ebd60e521052b4e4ab296328272d6948c5a4b7d