sphinxmark is currently broken due to Sphinx 2.0.0 release, this patch drops all of the code which uses it for now until we land an upstream fix that unbreaks us. Change-Id: Iba0bc579b6a82046ca0a0d7177d2ba9fd95ac3a4