manta: manta_defconfig: enable CONFIG_CRYPTO_AES_ARM_BS

- Set CONFIG_KERNEL_MODE_NEON
- Replace CONFIG_CRYPTO_AES_ARM with CONFIG_CRYPTO_AES_ARM_BS

Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug: 18378796
Change-Id: I9ca7b88853b33e11936c45e517d00e30ef61130d
diff --git a/arch/arm/configs/manta_defconfig b/arch/arm/configs/manta_defconfig
index 4d4a19b..51e315a 100644
--- a/arch/arm/configs/manta_defconfig
+++ b/arch/arm/configs/manta_defconfig
@@ -57,6 +57,7 @@
 CONFIG_CPU_IDLE=y
 CONFIG_VFP=y
 CONFIG_NEON=y
+CONFIG_KERNEL_MODE_NEON=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_BINFMT_MISC=y
 CONFIG_PM_AUTOSLEEP=y
@@ -472,7 +473,7 @@
 CONFIG_LSM_MMAP_MIN_ADDR=4096
 CONFIG_SECURITY_SELINUX=y
 CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_AES_ARM=y
+CONFIG_CRYPTO_AES_ARM_BS=y
 CONFIG_CRYPTO_TWOFISH=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 CONFIG_CRC_CCITT=y