Merge "Remove speex from the pathmap"
am: fbfff3129e

Change-Id: I3e1460124b235555860296363c065e24f872991c