To better show how I have changed them, this version of Services.h and Services.cpp is exactly as it was generated after the prior patch, except that I have added the MPL and run the formatter on both files. Cleanups will happen in the next patch. Differential Revision: https://phabricator.services.mozilla.com/D318841