diff --git a/Android.bp b/Android.bp
index 3df1c28..f6ccb09 100644
--- a/Android.bp
+++ b/Android.bp
@@ -59,6 +59,7 @@
         "clframework/src/core/CL/kernels/CLCopyKernel.cpp",
         "clframework/src/core/CL/kernels/CLCropKernel.cpp",
         "clframework/src/core/CL/kernels/CLDeconvolutionLayerUpsampleKernel.cpp",
+        "clframework/src/core/CL/kernels/CLDeconvolutionReshapeOutputKernel.cpp",
         "clframework/src/core/CL/kernels/CLDepthConcatenateLayerKernel.cpp",
         "clframework/src/core/CL/kernels/CLDepthConvertLayerKernel.cpp",
         "clframework/src/core/CL/kernels/CLDepthwiseConvolutionLayer3x3NCHWKernel.cpp",
@@ -78,6 +79,7 @@
         "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/CLFFTScaleKernel.cpp",
         "clframework/src/core/CL/kernels/CLFillBorderKernel.cpp",
         "clframework/src/core/CL/kernels/CLFlattenLayerKernel.cpp",
         "clframework/src/core/CL/kernels/CLFloorKernel.cpp",
@@ -197,7 +199,6 @@
         "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/winograd/padding.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",
@@ -208,6 +209,8 @@
         "clframework/src/core/NEON/kernels/convolution/depthwise/depthwise_4x4_3x3_2x2_fp32_fp32.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/padding.cpp",
+        "clframework/src/core/NEON/kernels/convolution/winograd/winograd.cpp",
         "clframework/src/core/NEON/kernels/convolution/winograd/winograd_transforms/input_1x8_fp32_fp32_integers.cpp",
         "clframework/src/core/NEON/kernels/convolution/winograd/winograd_transforms/input_4x4_fp32_fp32_integers.cpp",
         "clframework/src/core/NEON/kernels/convolution/winograd/winograd_transforms/input_6x6_fp32_fp32_integers.cpp",
@@ -223,7 +226,6 @@
         "clframework/src/core/NEON/kernels/convolution/winograd/winograd_transforms/weights_4_5_fp32_fp32_integers.cpp",
         "clframework/src/core/NEON/kernels/convolution/winograd/winograd_transforms/weights_4x4_3x3_fp32_fp32_integers.cpp",
         "clframework/src/core/NEON/kernels/convolution/winograd/winograd_transforms/weights_6_3_fp32_fp32_integers.cpp",
-        "clframework/src/core/NEON/kernels/convolution/winograd/winograd.cpp",
         "clframework/src/core/NEON/kernels/NEAbsoluteDifferenceKernel.cpp",
         "clframework/src/core/NEON/kernels/NEAccumulateKernel.cpp",
         "clframework/src/core/NEON/kernels/NEActivationLayerKernel.cpp",
@@ -262,6 +264,9 @@
         "clframework/src/core/NEON/kernels/NEElementwiseUnaryKernel.cpp",
         "clframework/src/core/NEON/kernels/NEErodeKernel.cpp",
         "clframework/src/core/NEON/kernels/NEFastCornersKernel.cpp",
+        "clframework/src/core/NEON/kernels/NEFFTDigitReverseKernel.cpp",
+        "clframework/src/core/NEON/kernels/NEFFTRadixStageKernel.cpp",
+        "clframework/src/core/NEON/kernels/NEFFTScaleKernel.cpp",
         "clframework/src/core/NEON/kernels/NEFillArrayKernel.cpp",
         "clframework/src/core/NEON/kernels/NEFillBorderKernel.cpp",
         "clframework/src/core/NEON/kernels/NEFillInnerBorderKernel.cpp",
@@ -411,6 +416,8 @@
         "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/CLFFT2D.cpp",
+        "clframework/src/runtime/CL/functions/CLFFTConvolutionLayer.cpp",
         "clframework/src/runtime/CL/functions/CLFillBorder.cpp",
         "clframework/src/runtime/CL/functions/CLFlattenLayer.cpp",
         "clframework/src/runtime/CL/functions/CLFloor.cpp",
@@ -422,6 +429,7 @@
         "clframework/src/runtime/CL/functions/CLGaussianPyramid.cpp",
         "clframework/src/runtime/CL/functions/CLGEMMConvolutionLayer.cpp",
         "clframework/src/runtime/CL/functions/CLGEMM.cpp",
+        "clframework/src/runtime/CL/functions/CLGEMMDeconvolutionLayer.cpp",
         "clframework/src/runtime/CL/functions/CLGEMMInterleave4x4.cpp",
         "clframework/src/runtime/CL/functions/CLGEMMLowpMatrixMultiplyCore.cpp",
         "clframework/src/runtime/CL/functions/CLGEMMLowpOutputStage.cpp",
@@ -556,6 +564,9 @@
         "clframework/src/runtime/NEON/functions/NEEqualizeHistogram.cpp",
         "clframework/src/runtime/NEON/functions/NEErode.cpp",
         "clframework/src/runtime/NEON/functions/NEFastCorners.cpp",
+        "clframework/src/runtime/NEON/functions/NEFFT1D.cpp",
+        "clframework/src/runtime/NEON/functions/NEFFT2D.cpp",
+        "clframework/src/runtime/NEON/functions/NEFFTConvolutionLayer.cpp",
         "clframework/src/runtime/NEON/functions/NEFillBorder.cpp",
         "clframework/src/runtime/NEON/functions/NEFlattenLayer.cpp",
         "clframework/src/runtime/NEON/functions/NEFloor.cpp",