Decouple CpuGemmMatrixMultiplyKernel and CpuGemmMatrixAdditionKernel

Resolves COMPMID-4629, COMPMID-4631
Change-Id: Idceafc84735116ef63ec13a202895f954b87e32f
Signed-off-by: Dana Zlotnik <dana.zlotnik@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/7095
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: SiCong Li <sicong.li@arm.com>
Reviewed-by: Giorgio Arena <giorgio.arena@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
diff --git a/Android.bp b/Android.bp
index ebea733..3081386 100644
--- a/Android.bp
+++ b/Android.bp
@@ -477,6 +477,12 @@
         "src/cpu/kernels/elementwise_unary/generic/sve/integer.cpp",
         "src/cpu/kernels/floor/neon/fp16.cpp",
         "src/cpu/kernels/floor/neon/fp32.cpp",
+        "src/cpu/kernels/gemm_matrix_add/generic/neon/fp16.cpp",
+        "src/cpu/kernels/gemm_matrix_add/generic/neon/fp32.cpp",
+        "src/cpu/kernels/gemm_matrix_add/generic/neon/impl.cpp",
+        "src/cpu/kernels/gemm_matrix_mul/generic/neon/fp16.cpp",
+        "src/cpu/kernels/gemm_matrix_mul/generic/neon/fp32.cpp",
+        "src/cpu/kernels/gemm_matrix_mul/generic/neon/impl.cpp",
         "src/cpu/kernels/genproposals/generic/neon/fp16.cpp",
         "src/cpu/kernels/genproposals/generic/neon/fp32.cpp",
         "src/cpu/kernels/genproposals/generic/neon/impl.cpp",