Sahara support was deprecated during previous Ussuri cycle[1], so we can remove it completely now. [1] f1d9b15c85 Change-Id: Id047221cb912c09984cc3bf864196a26fd36736f
f1d9b15c85