manifest: Combine geehrc and geespr into gee

Change-Id: I43afde07175ee41a652da9f5468ad8075b0a4150