diff --git a/Android.bp b/Android.bp
index c960ede..8168aa4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -21,6 +21,9 @@
         "clframework/src/core/AccessWindowTranspose.cpp",
         "clframework/src/core/CL/CLHelpers.cpp",
         "clframework/src/core/CL/CLKernelLibrary.cpp",
+        "clframework/src/core/CL/gemm/CLGEMMHelpers.cpp",
+        "clframework/src/core/CL/gemm/reshaped/CLGEMMReshapedKernelConfigurationBifrost.cpp",
+        "clframework/src/core/CL/gemm/reshaped_only_rhs/CLGEMMReshapedOnlyRHSKernelConfigurationBifrost.cpp",
         "clframework/src/core/CL/ICLDistribution1D.cpp",
         "clframework/src/core/CL/ICLHOG.cpp",
         "clframework/src/core/CL/ICLKernel.cpp",
@@ -84,6 +87,7 @@
         "clframework/src/core/CL/kernels/CLGEMMInterleave4x4Kernel.cpp",
         "clframework/src/core/CL/kernels/CLGEMMLowpMatrixMultiplyKernel.cpp",
         "clframework/src/core/CL/kernels/CLGEMMLowpMatrixMultiplyReshapedKernel.cpp",
+        "clframework/src/core/CL/kernels/CLGEMMLowpMatrixMultiplyReshapedOnlyRHSKernel.cpp",
         "clframework/src/core/CL/kernels/CLGEMMLowpOffsetContributionKernel.cpp",
         "clframework/src/core/CL/kernels/CLGEMMLowpOffsetContributionOutputStageKernel.cpp",
         "clframework/src/core/CL/kernels/CLGEMMLowpQuantizeDownInt32ToUint8ScaleByFixedPointKernel.cpp",
@@ -483,7 +487,6 @@
         "clframework/src/runtime/CL/functions/CLWinogradConvolutionLayer.cpp",
         "clframework/src/runtime/CL/functions/CLWinogradInputTransform.cpp",
         "clframework/src/runtime/CL/functions/CLYOLOLayer.cpp",
-        "clframework/src/runtime/CL/gemm_reshaped/CLGEMMReshapedConfigurationBifrost.cpp",
         "clframework/src/runtime/CL/ICLSimpleFunction.cpp",
         "clframework/src/runtime/CL/tuners/BifrostTuner.cpp",
         "clframework/src/runtime/CL/tuners/MidgardTuner.cpp",