Merge "libgsm's "gsm.h" is now C++-safe." am: 1aaaa4ea4a

Change-Id: Iaeb9033353d0880dc075d9242a37b3d1b54aef18
diff --git a/src/jni/rtp/GsmCodec.cpp b/src/jni/rtp/GsmCodec.cpp
index 4a04bfa..ff1acec 100644
--- a/src/jni/rtp/GsmCodec.cpp
+++ b/src/jni/rtp/GsmCodec.cpp
@@ -16,9 +16,7 @@
 
 #include "AudioCodec.h"
 
-extern "C" {
 #include "gsm.h"
-}
 
 namespace {