Bug 1048064 - Fix libstagefright build on GNU/kFreeBSD. r=ajones, a=NPOTB
Bug 995075 - Include update_filter() changes from upstream speexdsp. r=padenot, a=sledru

This includes changes to update_filter() that landed on m-c in bug 1042504.
Merge mozilla-beta to b2g32. a=merge