Vendor: Combine geehrc and geespr into gee

Change-Id: Ieea078369757e04fe6b921c905c77432f1644946