Another refactor, deleting AbstractFactoryRegistry.

I should have known better than to make these singletons to begin
with.  Globals create problems.  This undoes that mistake.

Cherry-picked from internal.

Change-Id: Ic258b107d17527b5feffd7e61889cadfee339f08
37 files changed