Move GenericEventDispatcher and DispatchingEntityStoreWatcher out of Lib

Change-Id: I046e774154e99f5777242612788b32748c15fbe8
Merge "Move GenericEventDispatcher and DispatchingEntityStoreWatcher out of Lib"