diff --git a/.circleci/Dockerfiles/Dockerfile.android b/.circleci/Dockerfiles/Dockerfile.android
index 431f802e3566dc..c34c36f054ce72 100644
--- a/.circleci/Dockerfiles/Dockerfile.android
+++ b/.circleci/Dockerfiles/Dockerfile.android
@@ -25,11 +25,13 @@ ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8"
 
 ADD .buckconfig /app/.buckconfig
 ADD .buckjavaargs /app/.buckjavaargs
-ADD tools /app/tools
+ADD Libraries /app/Libraries
 ADD ReactAndroid /app/ReactAndroid
 ADD ReactCommon /app/ReactCommon
 ADD React /app/React
 ADD keystores /app/keystores
+ADD packages/react-native-codegen /app/packages/react-native-codegen
+ADD tools /app/tools
 
 WORKDIR /app
 
@@ -49,4 +51,3 @@ RUN yarn
 RUN ./gradlew :ReactAndroid:downloadBoost :ReactAndroid:downloadDoubleConversion :ReactAndroid:downloadFolly :ReactAndroid:downloadGlog
 
 RUN ./gradlew :ReactAndroid:packageReactNdkLibsForBuck -Pjobs=1
-
diff --git a/metro.config.js b/metro.config.js
index a58484221c19b5..a868d504fc3935 100644
--- a/metro.config.js
+++ b/metro.config.js
@@ -18,6 +18,8 @@ const getPolyfills = require('./rn-get-polyfills');
  */
 module.exports = {
   resolver: {
+    // $FlowFixMe[signature-verification-failure] Can't infer RegExp type.
+    blacklistRE: /buck-out/,
     extraNodeModules: {
       'react-native': __dirname,
     },
diff --git a/packages/react-native-codegen/package.json b/packages/react-native-codegen/package.json
index b219d839b1742b..871da36b95f0a9 100644
--- a/packages/react-native-codegen/package.json
+++ b/packages/react-native-codegen/package.json
@@ -34,6 +34,7 @@
     "@babel/plugin-transform-flow-strip-types": "^7.0.0",
     "chalk": "^4.0.0",
     "glob": "^7.1.1",
+    "invariant": "^2.2.4",
     "micromatch": "^4.0.2",
     "mkdirp": "^0.5.1",
     "prettier": "1.19.1"