Merge "Use -Werror in external/speex" am: 7d5108889e
am: 39a2e16cf3

Change-Id: I72f891d5e114921a6dffdad677282cf87660a4de