Convert AnnotationFactory and MetaItemFactory to NamedClassFactories

Change-Id: Ic6e3a336050a335c88ef41735c0f4e470c5b75b6
Merge "Convert AnnotationFactory and MetaItemFactory to NamedClassFactories"