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

Change-Id: Id2e6e6d5e9aee416d43794c0f0634b1f51fbe14d