diff --git a/Android.bp b/Android.bp
index 4b76fe4..d318f76 100644
--- a/Android.bp
+++ b/Android.bp
@@ -34,9 +34,6 @@
         "clframework/src/core/CL/kernels/CLAbsoluteDifferenceKernel.cpp",
         "clframework/src/core/CL/kernels/CLAccumulateKernel.cpp",
         "clframework/src/core/CL/kernels/CLActivationLayerKernel.cpp",
-        "clframework/src/core/CL/kernels/CLArithmeticAdditionKernel.cpp",
-        "clframework/src/core/CL/kernels/CLArithmeticDivisionKernel.cpp",
-        "clframework/src/core/CL/kernels/CLArithmeticSubtractionKernel.cpp",
         "clframework/src/core/CL/kernels/CLBatchNormalizationLayerKernel.cpp",
         "clframework/src/core/CL/kernels/CLBatchToSpaceLayerKernel.cpp",
         "clframework/src/core/CL/kernels/CLBitwiseAndKernel.cpp",
@@ -66,6 +63,7 @@
         "clframework/src/core/CL/kernels/CLDilateKernel.cpp",
         "clframework/src/core/CL/kernels/CLDirectConvolutionLayerKernel.cpp",
         "clframework/src/core/CL/kernels/CLDirectConvolutionOutputStageKernel.cpp",
+        "clframework/src/core/CL/kernels/CLElementwiseOperationKernel.cpp",
         "clframework/src/core/CL/kernels/CLErodeKernel.cpp",
         "clframework/src/core/CL/kernels/CLFastCornersKernel.cpp",
         "clframework/src/core/CL/kernels/CLFillBorderKernel.cpp",
@@ -84,7 +82,10 @@
         "clframework/src/core/CL/kernels/CLGEMMMatrixAccumulateBiasesKernel.cpp",
         "clframework/src/core/CL/kernels/CLGEMMMatrixAdditionKernel.cpp",
         "clframework/src/core/CL/kernels/CLGEMMMatrixMultiplyKernel.cpp",
+        "clframework/src/core/CL/kernels/CLGEMMMatrixMultiplyReshapedKernel.cpp",
         "clframework/src/core/CL/kernels/CLGEMMMatrixVectorMultiplyKernel.cpp",
+        "clframework/src/core/CL/kernels/CLGEMMReshapeLHSMatrixKernel.cpp",
+        "clframework/src/core/CL/kernels/CLGEMMReshapeRHSMatrixKernel.cpp",
         "clframework/src/core/CL/kernels/CLGEMMTranspose1xWKernel.cpp",
         "clframework/src/core/CL/kernels/CLHarrisCornersKernel.cpp",
         "clframework/src/core/CL/kernels/CLHistogramKernel.cpp",
@@ -321,9 +322,6 @@
         "clframework/src/runtime/CL/functions/CLAbsoluteDifference.cpp",
         "clframework/src/runtime/CL/functions/CLAccumulate.cpp",
         "clframework/src/runtime/CL/functions/CLActivationLayer.cpp",
-        "clframework/src/runtime/CL/functions/CLArithmeticAddition.cpp",
-        "clframework/src/runtime/CL/functions/CLArithmeticDivision.cpp",
-        "clframework/src/runtime/CL/functions/CLArithmeticSubtraction.cpp",
         "clframework/src/runtime/CL/functions/CLBatchNormalizationLayer.cpp",
         "clframework/src/runtime/CL/functions/CLBatchToSpaceLayer.cpp",
         "clframework/src/runtime/CL/functions/CLBitwiseAnd.cpp",
@@ -351,6 +349,7 @@
         "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/CLElementwiseOperations.cpp",
         "clframework/src/runtime/CL/functions/CLEqualizeHistogram.cpp",
         "clframework/src/runtime/CL/functions/CLErode.cpp",
         "clframework/src/runtime/CL/functions/CLFastCorners.cpp",
@@ -539,6 +538,7 @@
         "clframework/src/runtime/NEON/functions/NEWinogradConvolutionLayer.cpp",
         "clframework/src/runtime/NEON/functions/NEYOLOLayer.cpp",
         "clframework/src/runtime/NEON/INESimpleFunction.cpp",
+        "clframework/src/runtime/NEON/INESimpleFunctionNoBorder.cpp",
         "clframework/src/runtime/OffsetLifetimeManager.cpp",
         "clframework/src/runtime/OffsetMemoryPool.cpp",
         "clframework/src/runtime/OMP/OMPScheduler.cpp",