Merge "Remove speex from the pathmap"