diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn
index 796d3bea4f..1e49597f1f 100644
--- a/sdk/android/BUILD.gn
+++ b/sdk/android/BUILD.gn
@@ -239,6 +239,8 @@ if (is_android) {
       "api/org/webrtc/YuvConverter.java",
       "api/org/webrtc/YuvHelper.java",
       "api/org/webrtc/TimestampAligner.java",
+      "api/org/webrtc/WrappedNativeVideoDecoder.java",
+      "api/org/webrtc/WrappedNativeVideoEncoder.java",
       "src/java/org/webrtc/EglBase10Impl.java",
       "src/java/org/webrtc/EglBase14Impl.java",
       "src/java/org/webrtc/GlGenericDrawer.java",
@@ -247,8 +249,6 @@ if (is_android) {
       "src/java/org/webrtc/VideoDecoderWrapper.java",
       "src/java/org/webrtc/VideoEncoderWrapper.java",
       "src/java/org/webrtc/WrappedNativeI420Buffer.java",
-      "src/java/org/webrtc/WrappedNativeVideoDecoder.java",
-      "src/java/org/webrtc/WrappedNativeVideoEncoder.java",
     ]
 
     deps = [
diff --git a/sdk/android/src/java/org/webrtc/WrappedNativeVideoDecoder.java b/sdk/android/api/org/webrtc/WrappedNativeVideoDecoder.java
similarity index 71%
rename from sdk/android/src/java/org/webrtc/WrappedNativeVideoDecoder.java
rename to sdk/android/api/org/webrtc/WrappedNativeVideoDecoder.java
index 80070d3ada..b70c664915 100644
--- a/sdk/android/src/java/org/webrtc/WrappedNativeVideoDecoder.java
+++ b/sdk/android/api/org/webrtc/WrappedNativeVideoDecoder.java
@@ -13,31 +13,31 @@ package org.webrtc;
 /**
  * Wraps a native webrtc::VideoDecoder.
  */
-abstract class WrappedNativeVideoDecoder implements VideoDecoder {
+public abstract class WrappedNativeVideoDecoder implements VideoDecoder {
   @Override public abstract long createNativeVideoDecoder();
 
   @Override
-  public VideoCodecStatus initDecode(Settings settings, Callback decodeCallback) {
+  public final VideoCodecStatus initDecode(Settings settings, Callback decodeCallback) {
     throw new UnsupportedOperationException("Not implemented.");
   }
 
   @Override
-  public VideoCodecStatus release() {
+  public final VideoCodecStatus release() {
     throw new UnsupportedOperationException("Not implemented.");
   }
 
   @Override
-  public VideoCodecStatus decode(EncodedImage frame, DecodeInfo info) {
+  public final VideoCodecStatus decode(EncodedImage frame, DecodeInfo info) {
     throw new UnsupportedOperationException("Not implemented.");
   }
 
   @Override
-  public boolean getPrefersLateDecoding() {
+  public final boolean getPrefersLateDecoding() {
     throw new UnsupportedOperationException("Not implemented.");
   }
 
   @Override
-  public String getImplementationName() {
+  public final String getImplementationName() {
     throw new UnsupportedOperationException("Not implemented.");
   }
 }
diff --git a/sdk/android/src/java/org/webrtc/WrappedNativeVideoEncoder.java b/sdk/android/api/org/webrtc/WrappedNativeVideoEncoder.java
similarity index 69%
rename from sdk/android/src/java/org/webrtc/WrappedNativeVideoEncoder.java
rename to sdk/android/api/org/webrtc/WrappedNativeVideoEncoder.java
index 959cafca56..7d0908a6ac 100644
--- a/sdk/android/src/java/org/webrtc/WrappedNativeVideoEncoder.java
+++ b/sdk/android/api/org/webrtc/WrappedNativeVideoEncoder.java
@@ -13,37 +13,37 @@ package org.webrtc;
 /**
  * Wraps a native webrtc::VideoEncoder.
  */
-abstract class WrappedNativeVideoEncoder implements VideoEncoder {
+public abstract class WrappedNativeVideoEncoder implements VideoEncoder {
   @Override public abstract long createNativeVideoEncoder();
   @Override public abstract boolean isHardwareEncoder();
 
   @Override
-  public VideoCodecStatus initEncode(Settings settings, Callback encodeCallback) {
+  public final VideoCodecStatus initEncode(Settings settings, Callback encodeCallback) {
     throw new UnsupportedOperationException("Not implemented.");
   }
 
   @Override
-  public VideoCodecStatus release() {
+  public final VideoCodecStatus release() {
     throw new UnsupportedOperationException("Not implemented.");
   }
 
   @Override
-  public VideoCodecStatus encode(VideoFrame frame, EncodeInfo info) {
+  public final VideoCodecStatus encode(VideoFrame frame, EncodeInfo info) {
     throw new UnsupportedOperationException("Not implemented.");
   }
 
   @Override
-  public VideoCodecStatus setRateAllocation(BitrateAllocation allocation, int framerate) {
+  public final VideoCodecStatus setRateAllocation(BitrateAllocation allocation, int framerate) {
     throw new UnsupportedOperationException("Not implemented.");
   }
 
   @Override
-  public ScalingSettings getScalingSettings() {
+  public final ScalingSettings getScalingSettings() {
     throw new UnsupportedOperationException("Not implemented.");
   }
 
   @Override
-  public String getImplementationName() {
+  public final String getImplementationName() {
     throw new UnsupportedOperationException("Not implemented.");
   }
 }