diff --git a/Android.mk b/Android.mk
index 03c5410bd6..7d1e7f7ae4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,7 +16,7 @@ include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/neteq/Android.mk
 include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/cng/Android.mk
 include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/G711/main/source/Android.mk
 include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/G722/main/source/Android.mk
-include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/PCM16B/main/source/Android.mk
+include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/pcm16b/Android.mk
 include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/ilbc/Android.mk
 include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/iSAC/fix/source/Android.mk
 include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/iSAC/main/source/Android.mk
diff --git a/src/modules/audio_coding/codecs/PCM16B/main/source/Android.mk b/src/modules/audio_coding/codecs/pcm16b/Android.mk
similarity index 87%
rename from src/modules/audio_coding/codecs/PCM16B/main/source/Android.mk
rename to src/modules/audio_coding/codecs/pcm16b/Android.mk
index ec43c4846c..2e88fa6041 100644
--- a/src/modules/audio_coding/codecs/PCM16B/main/source/Android.mk
+++ b/src/modules/audio_coding/codecs/pcm16b/Android.mk
@@ -10,7 +10,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-include $(LOCAL_PATH)/../../../../../../../android-webrtc.mk
+include $(LOCAL_PATH)/../../../../../android-webrtc.mk
 
 LOCAL_ARM_MODE := arm
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
@@ -23,8 +23,8 @@ LOCAL_CFLAGS := \
     $(MY_WEBRTC_COMMON_DEFS)
 
 LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/../interface \
-    $(LOCAL_PATH)/../../../../../..
+    $(LOCAL_PATH)/include \
+    $(LOCAL_PATH)/../../../..
 
 LOCAL_SHARED_LIBRARIES := \
     libcutils \
diff --git a/src/modules/audio_coding/codecs/PCM16B/main/interface/pcm16b.h b/src/modules/audio_coding/codecs/pcm16b/include/pcm16b.h
similarity index 100%
rename from src/modules/audio_coding/codecs/PCM16B/main/interface/pcm16b.h
rename to src/modules/audio_coding/codecs/pcm16b/include/pcm16b.h
diff --git a/src/modules/audio_coding/codecs/PCM16B/main/source/pcm16b.c b/src/modules/audio_coding/codecs/pcm16b/pcm16b.c
similarity index 100%
rename from src/modules/audio_coding/codecs/PCM16B/main/source/pcm16b.c
rename to src/modules/audio_coding/codecs/pcm16b/pcm16b.c
diff --git a/src/modules/audio_coding/codecs/PCM16B/main/source/pcm16b.gypi b/src/modules/audio_coding/codecs/pcm16b/pcm16b.gypi
similarity index 58%
rename from src/modules/audio_coding/codecs/PCM16B/main/source/pcm16b.gypi
rename to src/modules/audio_coding/codecs/pcm16b/pcm16b.gypi
index 07152a7146..ec917751e8 100644
--- a/src/modules/audio_coding/codecs/PCM16B/main/source/pcm16b.gypi
+++ b/src/modules/audio_coding/codecs/pcm16b/pcm16b.gypi
@@ -12,19 +12,36 @@
       'target_name': 'PCM16B',
       'type': '<(library)',
       'include_dirs': [
-        '../interface',
+        'include',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
-          '../interface',
+          'include',
         ],
       },
       'sources': [
-        '../interface/pcm16b.h',
+        'include/pcm16b.h',
         'pcm16b.c',
       ],
     },
-  ],
+  ], # targets
+  'conditions': [
+    ['build_with_chromium==0', {
+      'targets': [
+        {
+          'target_name': 'pcm16b_unittests',
+          'type': 'executable',
+          'dependencies': [
+            'PCM16B',
+            '<(webrtc_root)/../test/test.gyp:test_support_main',
+          ],
+          'sources': [
+            'pcm16b_unittest.cc',
+          ],
+        }, # PCM16B_unittests
+      ], # targets
+    }], # build_with_chromium
+  ], # conditions
 }
 
 # Local Variables:
diff --git a/src/modules/audio_coding/codecs/pcm16b/pcm16b_unittest.cc b/src/modules/audio_coding/codecs/pcm16b/pcm16b_unittest.cc
new file mode 100644
index 0000000000..556741eff9
--- /dev/null
+++ b/src/modules/audio_coding/codecs/pcm16b/pcm16b_unittest.cc
@@ -0,0 +1,18 @@
+/*
+ *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+/*
+ * Empty test just to get code coverage metrics for this dir.
+ */
+#include "pcm16b.h"
+
+
+
+
diff --git a/src/modules/audio_coding/main/source/Android.mk b/src/modules/audio_coding/main/source/Android.mk
index 5c1c7cef53..7e0354b0d0 100644
--- a/src/modules/audio_coding/main/source/Android.mk
+++ b/src/modules/audio_coding/main/source/Android.mk
@@ -47,7 +47,7 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/../../codecs/ilbc/interface \
     $(LOCAL_PATH)/../../codecs/iSAC/main/interface \
     $(LOCAL_PATH)/../../codecs/iSAC/fix/interface \
-    $(LOCAL_PATH)/../../codecs/PCM16B/main/interface \
+    $(LOCAL_PATH)/../../codecs/pcm16b/include \
     $(LOCAL_PATH)/../../neteq/interface \
     $(LOCAL_PATH)/../../../.. \
     $(LOCAL_PATH)/../../../interface \
diff --git a/src/modules/modules.gyp b/src/modules/modules.gyp
index 75440862cf..61ece85a87 100644
--- a/src/modules/modules.gyp
+++ b/src/modules/modules.gyp
@@ -15,7 +15,7 @@
     'audio_coding/codecs/ilbc/ilbc.gypi',
     'audio_coding/codecs/iSAC/main/source/isac.gypi',
     'audio_coding/codecs/iSAC/fix/source/isacfix.gypi',
-    'audio_coding/codecs/PCM16B/main/source/pcm16b.gypi',
+    'audio_coding/codecs/pcm16b/pcm16b.gypi',
     'audio_coding/main/source/audio_coding_module.gypi',
     'audio_coding/neteq/neteq.gypi',
     'audio_conference_mixer/source/audio_conference_mixer.gypi',
diff --git a/src/voice_engine/main/test/android/android_test/jni/Android.mk b/src/voice_engine/main/test/android/android_test/jni/Android.mk
index 7f44f6d70d..e0cd46a379 100644
--- a/src/voice_engine/main/test/android/android_test/jni/Android.mk
+++ b/src/voice_engine/main/test/android/android_test/jni/Android.mk
@@ -19,7 +19,7 @@ include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/modules/audio_coding/Ne
 include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/modules/audio_coding/codecs/cng/Android.mk
 include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/modules/audio_coding/codecs/G711/main/source/Android.mk
 include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/modules/audio_coding/codecs/G722/main/source/Android.mk
-include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/modules/audio_coding/codecs/PCM16B/main/source/Android.mk
+include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/modules/audio_coding/codecs/pcm16b/Android.mk
 include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/modules/audio_coding/codecs/iLBC/main/source/Android.mk
 include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/modules/audio_coding/codecs/iSAC/fix/source/Android.mk
 include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/modules/audio_coding/codecs/iSAC/main/source/Android.mk