diff --git a/Android.bp b/Android.bp
index 03b2ded..e44275f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -37,6 +37,7 @@
         "clframework/src/core/CL/kernels/CLActivationLayerKernel.cpp",
         "clframework/src/core/CL/kernels/CLArithmeticAdditionKernel.cpp",
         "clframework/src/core/CL/kernels/CLArithmeticSubtractionKernel.cpp",
+        "clframework/src/core/CL/kernels/CLArithmeticDivisionKernel.cpp",
         "clframework/src/core/CL/kernels/CLBatchNormalizationLayerKernel.cpp",
         "clframework/src/core/CL/kernels/CLBitwiseAndKernel.cpp",
         "clframework/src/core/CL/kernels/CLBitwiseNotKernel.cpp",
@@ -46,8 +47,10 @@
         "clframework/src/core/CL/kernels/CLCannyEdgeKernel.cpp",
         "clframework/src/core/CL/kernels/CLChannelCombineKernel.cpp",
         "clframework/src/core/CL/kernels/CLChannelExtractKernel.cpp",
+        "clframework/src/core/CL/kernels/CLChannelShuffleLayerKernel.cpp",
         "clframework/src/core/CL/kernels/CLCol2ImKernel.cpp",
         "clframework/src/core/CL/kernels/CLColorConvertKernel.cpp",
+        "clframework/src/core/CL/kernels/CLConvertFullyConnectedWeightsKernel.cpp",
         "clframework/src/core/CL/kernels/CLConvolutionKernel.cpp",
         "clframework/src/core/CL/kernels/CLCopyKernel.cpp",
         "clframework/src/core/CL/kernels/CLDeconvolutionLayerUpsampleKernel.cpp",
@@ -66,6 +69,7 @@
         "clframework/src/core/CL/kernels/CLErodeKernel.cpp",
         "clframework/src/core/CL/kernels/CLFastCornersKernel.cpp",
         "clframework/src/core/CL/kernels/CLFillBorderKernel.cpp",
+        "clframework/src/core/CL/kernels/CLFlattenLayerKernel.cpp",
         "clframework/src/core/CL/kernels/CLFloorKernel.cpp",
         "clframework/src/core/CL/kernels/CLGaussian3x3Kernel.cpp",
         "clframework/src/core/CL/kernels/CLGaussian5x5Kernel.cpp",
@@ -118,6 +122,7 @@
         "clframework/src/core/CL/kernels/CLWarpAffineKernel.cpp",
         "clframework/src/core/CL/kernels/CLWarpPerspectiveKernel.cpp",
         "clframework/src/core/CL/kernels/CLWeightsReshapeKernel.cpp",
+        "clframework/src/core/CL/kernels/CLWidthConcatenateLayerKernel.cpp",
         "clframework/src/core/CL/kernels/CLWinogradFilterTransformKernel.cpp",
         "clframework/src/core/CL/kernels/CLWinogradInputTransformKernel.cpp",
         "clframework/src/core/CL/kernels/CLWinogradOutputTransformKernel.cpp",
@@ -144,6 +149,11 @@
         "clframework/src/core/NEON/kernels/arm_gemm/gemm_int8.cpp",
         "clframework/src/core/NEON/kernels/arm_gemm/gemm_uint16.cpp",
         "clframework/src/core/NEON/kernels/arm_gemm/gemm_uint8.cpp",
+        "clframework/src/core/NEON/kernels/assembly/INEGEMMWrapperKernel.cpp",
+        "clframework/src/core/NEON/kernels/assembly/NEGEMMInterleavedMatrixMultiplyWrapper.cpp",
+        "clframework/src/core/NEON/kernels/assembly/NEGEMMInterleavedPrepareBWrapperKernel.cpp",
+        "clframework/src/core/NEON/kernels/assembly/NEGEMMInterleavedTransformAWrapper.cpp",
+        "clframework/src/core/NEON/kernels/assembly/NEGEMMNativeWrapperKernel.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",
@@ -178,6 +188,7 @@
         "clframework/src/core/NEON/kernels/NEChannelExtractKernel.cpp",
         "clframework/src/core/NEON/kernels/NECol2ImKernel.cpp",
         "clframework/src/core/NEON/kernels/NEColorConvertKernel.cpp",
+        "clframework/src/core/NEON/kernels/NEConvertFullyConnectedWeightsKernel.cpp",
         "clframework/src/core/NEON/kernels/NEConvolutionKernel.cpp",
         "clframework/src/core/NEON/kernels/NECumulativeDistributionKernel.cpp",
         "clframework/src/core/NEON/kernels/NEDepthConcatenateLayerKernel.cpp",
@@ -247,6 +258,7 @@
         "clframework/src/core/NEON/kernels/NETransposeKernel.cpp",
         "clframework/src/core/NEON/kernels/NEWarpKernel.cpp",
         "clframework/src/core/NEON/kernels/NEWeightsReshapeKernel.cpp",
+        "clframework/src/core/NEON/kernels/NEWidthConcatenateLayerKernel.cpp",
         "clframework/src/core/NEON/kernels/NEWinogradConvolutionLayerKernel.cpp",
         "clframework/src/core/PyramidInfo.cpp",
         "clframework/src/core/Rounding.cpp",
@@ -282,6 +294,7 @@
         "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/CLBitwiseAnd.cpp",
@@ -292,7 +305,10 @@
         "clframework/src/runtime/CL/functions/CLCannyEdge.cpp",
         "clframework/src/runtime/CL/functions/CLChannelCombine.cpp",
         "clframework/src/runtime/CL/functions/CLChannelExtract.cpp",
+        "clframework/src/runtime/CL/functions/CLChannelShuffleLayer.cpp",
         "clframework/src/runtime/CL/functions/CLColorConvert.cpp",
+        "clframework/src/runtime/CL/functions/CLConcatenateLayer.cpp",
+        "clframework/src/runtime/CL/functions/CLConvertFullyConnectedWeights.cpp",
         "clframework/src/runtime/CL/functions/CLConvolution.cpp",
         "clframework/src/runtime/CL/functions/CLConvolutionLayer.cpp",
         "clframework/src/runtime/CL/functions/CLCopy.cpp",
@@ -333,6 +349,7 @@
         "clframework/src/runtime/CL/functions/CLLaplacianPyramid.cpp",
         "clframework/src/runtime/CL/functions/CLLaplacianReconstruct.cpp",
         "clframework/src/runtime/CL/functions/CLLocallyConnectedLayer.cpp",
+        "clframework/src/runtime/CL/functions/CLLSTMLayer.cpp",
         "clframework/src/runtime/CL/functions/CLMagnitude.cpp",
         "clframework/src/runtime/CL/functions/CLMeanStdDev.cpp",
         "clframework/src/runtime/CL/functions/CLMedian3x3.cpp",
@@ -362,10 +379,12 @@
         "clframework/src/runtime/CL/functions/CLTranspose.cpp",
         "clframework/src/runtime/CL/functions/CLWarpAffine.cpp",
         "clframework/src/runtime/CL/functions/CLWarpPerspective.cpp",
+        "clframework/src/runtime/CL/functions/CLWidthConcatenateLayer.cpp",
         "clframework/src/runtime/CL/functions/CLWinogradConvolutionLayer.cpp",
         "clframework/src/runtime/CL/functions/CLWinogradInputTransform.cpp",
         "clframework/src/runtime/CL/ICLSimpleFunction.cpp",
         "clframework/src/runtime/CL/tuners/BifrostTuner.cpp",
+        "clframework/src/runtime/CL/tuners/MidgardTuner.cpp",
         "clframework/src/runtime/CPP/CPPScheduler.cpp",
         "clframework/src/runtime/CPP/functions/CPPPermute.cpp",
         "clframework/src/runtime/CPP/functions/CPPUpsample.cpp",
@@ -384,6 +403,7 @@
         "clframework/src/runtime/MemoryManagerOnDemand.cpp",
         "clframework/src/runtime/MultiHOG.cpp",
         "clframework/src/runtime/MultiImage.cpp",
+        "clframework/src/runtime/NEON/functions/assembly/NEGEMMInterleavedWrapper.cpp",
         "clframework/src/runtime/NEON/functions/NEAbsoluteDifference.cpp",
         "clframework/src/runtime/NEON/functions/NEAccumulate.cpp",
         "clframework/src/runtime/NEON/functions/NEActivationLayer.cpp",
@@ -400,6 +420,8 @@
         "clframework/src/runtime/NEON/functions/NEChannelExtract.cpp",
         "clframework/src/runtime/NEON/functions/NECol2Im.cpp",
         "clframework/src/runtime/NEON/functions/NEColorConvert.cpp",
+        "clframework/src/runtime/NEON/functions/NEConcatenateLayer.cpp",
+        "clframework/src/runtime/NEON/functions/NEConvertFullyConnectedWeights.cpp",
         "clframework/src/runtime/NEON/functions/NEConvolution.cpp",
         "clframework/src/runtime/NEON/functions/NEConvolutionLayer.cpp",
         "clframework/src/runtime/NEON/functions/NEDeconvolutionLayer.cpp",
@@ -421,6 +443,7 @@
         "clframework/src/runtime/NEON/functions/NEGaussian3x3.cpp",
         "clframework/src/runtime/NEON/functions/NEGaussian5x5.cpp",
         "clframework/src/runtime/NEON/functions/NEGaussianPyramid.cpp",
+        "clframework/src/runtime/NEON/functions/NEGEMMAssemblyDispatch.cpp",
         "clframework/src/runtime/NEON/functions/NEGEMMConvolutionLayer.cpp",
         "clframework/src/runtime/NEON/functions/NEGEMM.cpp",
         "clframework/src/runtime/NEON/functions/NEGEMMInterleave4x4.cpp",
@@ -457,8 +480,10 @@
         "clframework/src/runtime/NEON/functions/NERemap.cpp",
         "clframework/src/runtime/NEON/functions/NEReshapeLayer.cpp",
         "clframework/src/runtime/NEON/functions/NEROIPoolingLayer.cpp",
+        "clframework/src/runtime/NEON/functions/NERNNLayer.cpp",
         "clframework/src/runtime/NEON/functions/NEScale.cpp",
         "clframework/src/runtime/NEON/functions/NEScharr3x3.cpp",
+        "clframework/src/runtime/NEON/functions/NESimpleAssemblyFunction.cpp",
         "clframework/src/runtime/NEON/functions/NESobel3x3.cpp",
         "clframework/src/runtime/NEON/functions/NESobel5x5.cpp",
         "clframework/src/runtime/NEON/functions/NESobel7x7.cpp",
@@ -468,11 +493,11 @@
         "clframework/src/runtime/NEON/functions/NETranspose.cpp",
         "clframework/src/runtime/NEON/functions/NEWarpAffine.cpp",
         "clframework/src/runtime/NEON/functions/NEWarpPerspective.cpp",
+        "clframework/src/runtime/NEON/functions/NEWidthConcatenateLayer.cpp",
         "clframework/src/runtime/NEON/functions/NEWinogradConvolutionLayer.cpp",
         "clframework/src/runtime/NEON/INESimpleFunction.cpp",
         "clframework/src/runtime/OffsetLifetimeManager.cpp",
         "clframework/src/runtime/OffsetMemoryPool.cpp",
-        "clframework/src/runtime/OMP/OMPScheduler.cpp",
         "clframework/src/runtime/PoolManager.cpp",
         "clframework/src/runtime/Pyramid.cpp",
         "clframework/src/runtime/Scheduler.cpp",
@@ -480,6 +505,7 @@
         "clframework/src/runtime/TensorAllocator.cpp",
         "clframework/src/runtime/Tensor.cpp",
         "clframework/src/runtime/Utils.cpp",
+        "clframework/utils/CommonGraphOptions.cpp",
         "clframework/utils/GraphUtils.cpp",
         "clframework/utils/Utils.cpp",
     ],
@@ -518,6 +544,7 @@
         "-fexceptions",
         "-DEMBEDDED_KERNELS",
         "-DARM_COMPUTE_ASSERTS_ENABLED",
+        "-DARM_COMPUTE_CPP_SCHEDULER",
         "-Wno-unused-parameter",
         "-DNO_DOT_IN_TOOLCHAIN",
         "-no-integrated-as"