Revert "Favor on doOnTerminate over EndObserver, update dependencies"

doOnTerminate and doOnEach are never called.