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

Change-Id: I859456941f5355a016b9bc6c1669d23bed0c9ae0
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 {