diff --git a/Android.bp b/Android.bp
index c597ce6..c960ede 100644
--- a/Android.bp
+++ b/Android.bp
@@ -71,6 +71,8 @@
         "clframework/src/core/CL/kernels/CLElementWiseUnaryLayerKernel.cpp",
         "clframework/src/core/CL/kernels/CLErodeKernel.cpp",
         "clframework/src/core/CL/kernels/CLFastCornersKernel.cpp",
+        "clframework/src/core/CL/kernels/CLFFTDigitReverseKernel.cpp",
+        "clframework/src/core/CL/kernels/CLFFTRadixStageKernel.cpp",
         "clframework/src/core/CL/kernels/CLFillBorderKernel.cpp",
         "clframework/src/core/CL/kernels/CLFlattenLayerKernel.cpp",
         "clframework/src/core/CL/kernels/CLFloorKernel.cpp",
@@ -186,17 +188,19 @@
         "clframework/src/core/NEON/kernels/assembly/Helpers.cpp",
         "clframework/src/core/NEON/kernels/assembly/INEGEMMWrapperKernel.cpp",
         "clframework/src/core/NEON/kernels/assembly/NEGEMMNativeWrapperKernel.cpp",
+        "clframework/src/core/NEON/kernels/convolution/common/padding.cpp",
+        "clframework/src/core/NEON/kernels/convolution/common/qasymm8.cpp",
         "clframework/src/core/NEON/kernels/convolution/common/utils.cpp",
         "clframework/src/core/NEON/kernels/convolution/depthwise/depthwise_2x2_3x3_1x1_fp32_fp32.cpp",
         "clframework/src/core/NEON/kernels/convolution/depthwise/depthwise_2x2_3x3_2x2_fp32_fp32.cpp",
+        "clframework/src/core/NEON/kernels/convolution/depthwise/depthwise_3x3_3x3_1x1_fp16_fp16.cpp",
         "clframework/src/core/NEON/kernels/convolution/depthwise/depthwise_3x3_3x3_1x1_fp32_fp32.cpp",
+        "clframework/src/core/NEON/kernels/convolution/depthwise/depthwise_3x3_3x3_2x2_fp16_fp16.cpp",
         "clframework/src/core/NEON/kernels/convolution/depthwise/depthwise_3x3_3x3_2x2_fp32_fp32.cpp",
-        "clframework/src/core/NEON/kernels/convolution/depthwise/depthwise_4x4_3x3_1x1_fp16_fp16.cpp",
         "clframework/src/core/NEON/kernels/convolution/depthwise/depthwise_4x4_3x3_1x1_fp32_fp32.cpp",
-        "clframework/src/core/NEON/kernels/convolution/depthwise/depthwise_4x4_3x3_1x1_u8_s32.cpp",
-        "clframework/src/core/NEON/kernels/convolution/depthwise/depthwise_4x4_3x3_2x2_fp16_fp16.cpp",
         "clframework/src/core/NEON/kernels/convolution/depthwise/depthwise_4x4_3x3_2x2_fp32_fp32.cpp",
-        "clframework/src/core/NEON/kernels/convolution/depthwise/depthwise_4x4_3x3_2x2_u8_s32.cpp",
+        "clframework/src/core/NEON/kernels/convolution/depthwise/depthwise_pack_parameters.cpp",
+        "clframework/src/core/NEON/kernels/convolution/depthwise/depthwise_qa8_qa8.cpp",
         "clframework/src/core/NEON/kernels/convolution/winograd/batched_blocked_gemm.cpp",
         "clframework/src/core/NEON/kernels/convolution/winograd/transforms/input_1x8_fp32.cpp",
         "clframework/src/core/NEON/kernels/convolution/winograd/transforms/input_2x2_3x3_fp32.cpp",
@@ -330,6 +334,7 @@
         "clframework/src/core/SubTensorInfo.cpp",
         "clframework/src/core/TensorInfo.cpp",
         "clframework/src/core/Utils.cpp",
+        "clframework/src/core/utils/helpers/fft.cpp",
         "clframework/src/core/utils/helpers/tensor_transform.cpp",
         "clframework/src/core/utils/io/FileHandler.cpp",
         "clframework/src/core/utils/logging/FilePrinter.cpp",
@@ -393,11 +398,13 @@
         "clframework/src/runtime/CL/functions/CLDerivative.cpp",
         "clframework/src/runtime/CL/functions/CLDilate.cpp",
         "clframework/src/runtime/CL/functions/CLDirectConvolutionLayer.cpp",
+        "clframework/src/runtime/CL/functions/CLDirectDeconvolutionLayer.cpp",
         "clframework/src/runtime/CL/functions/CLElementwiseOperations.cpp",
         "clframework/src/runtime/CL/functions/CLElementWiseUnaryLayer.cpp",
         "clframework/src/runtime/CL/functions/CLEqualizeHistogram.cpp",
         "clframework/src/runtime/CL/functions/CLErode.cpp",
         "clframework/src/runtime/CL/functions/CLFastCorners.cpp",
+        "clframework/src/runtime/CL/functions/CLFFT1D.cpp",
         "clframework/src/runtime/CL/functions/CLFillBorder.cpp",
         "clframework/src/runtime/CL/functions/CLFlattenLayer.cpp",
         "clframework/src/runtime/CL/functions/CLFloor.cpp",
@@ -502,6 +509,7 @@
         "clframework/src/runtime/MEMUtils.cpp",
         "clframework/src/runtime/MultiHOG.cpp",
         "clframework/src/runtime/MultiImage.cpp",
+        "clframework/src/runtime/NEON/functions/assembly/NEDepthwiseConvolutionAssemblyDispatch.cpp",
         "clframework/src/runtime/NEON/functions/assembly/NEGEMMInterleavedWrapper.cpp",
         "clframework/src/runtime/NEON/functions/NEAbsoluteDifference.cpp",
         "clframework/src/runtime/NEON/functions/NEAccumulate.cpp",