Merge "Remove speex from the pathmap" am: fbfff3129e am: 7da7001c18
am: 50e79ad9ce

Change-Id: I79f1ad4aedd657fbaf66e2f9e64dd4c7e9231006