Merge PPR2.181005.003 from pi-release-2 into pi-platform-release.

Change-Id: Ifb0130fa2b413d1b8a769684cffb6c6621ea9859
BUG: 117431430
diff --git a/cryptfs.cpp b/cryptfs.cpp
index 2ab3d09..c5024ae 100644
--- a/cryptfs.cpp
+++ b/cryptfs.cpp
@@ -317,10 +317,6 @@
 
 constexpr CryptoType supported_crypto_types[] = {
     default_crypto_type,
-    CryptoType()
-        .set_property_name("Speck128/128-XTS")
-        .set_crypto_name("speck128-xts-plain64")
-        .set_keysize(32),
     // Add new CryptoTypes here.  Order is not important.
 };