AArch64 ports of Convolve3x3 and Convolve5x5.

Change-Id: I68d9e0ddda128f07d4383d20e9bad161f0c6965b
diff --git a/cpu_ref/Android.mk b/cpu_ref/Android.mk
index d44f872..85e34b4 100644
--- a/cpu_ref/Android.mk
+++ b/cpu_ref/Android.mk
@@ -43,6 +43,7 @@
 #    rsCpuIntrinsics_advsimd_3DLUT.S \
 #    rsCpuIntrinsics_advsimd_Blend.S \
 #    rsCpuIntrinsics_advsimd_Blur.S \
+#    rsCpuIntrinsics_advsimd_Convolve.S \
 #    rsCpuIntrinsics_advsimd_ColorMatrix.S \
 #    rsCpuIntrinsics_advsimd_YuvToRGB.S
 
@@ -53,10 +54,10 @@
 ifeq ($(ARCH_ARM_HAVE_VFP),true)
     LOCAL_CFLAGS_arm += -DARCH_ARM_HAVE_VFP
     LOCAL_SRC_FILES_arm += \
-    rsCpuIntrinsics_neon.S \
     rsCpuIntrinsics_neon_3DLUT.S \
     rsCpuIntrinsics_neon_Blend.S \
     rsCpuIntrinsics_neon_Blur.S \
+    rsCpuIntrinsics_neon_Convolve.S \
     rsCpuIntrinsics_neon_ColorMatrix.S \
     rsCpuIntrinsics_neon_YuvToRGB.S \
     convolve/convolve_copy_neon.s \