diff --git a/client_utils/android/SkFrontBufferedStream.h b/client_utils/android/SkFrontBufferedStream.h
deleted file mode 100644
index e1783dac00..0000000000
--- a/client_utils/android/SkFrontBufferedStream.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2013 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkFrontBufferedStream_DEFINED
-#define SkFrontBufferedStream_DEFINED
-
-#include "FrontBufferedStream.h"
-
-// Temporary pass through until Android updates to use the new API.
-class SK_API SkFrontBufferedStream {
-public:
-    static std::unique_ptr<SkStreamRewindable> Make(std::unique_ptr<SkStream> stream,
-                                                    size_t minBufferSize) {
-        return android::skia::FrontBufferedStream::Make(std::move(stream), minBufferSize);
-    }
-};
-#endif  // SkFrontBufferedStream_DEFINED
diff --git a/infra/bots/compile.isolate b/infra/bots/compile.isolate
index c223893347..68df0d08e8 100644
--- a/infra/bots/compile.isolate
+++ b/infra/bots/compile.isolate
@@ -15,7 +15,8 @@
       '../../build/fuchsia',
       '../../build_overrides',
       '../../buildtools',
-      '../../client_utils/android',
+      '../../client_utils/android/FrontBufferedStream.cpp',
+      '../../client_utils/android/FrontBufferedStream.h',
       '../../dm',
       '../../docs/examples',
       '../../example',