Merge "cryptfs: Remove Speck support" am: cf0cb0bc1f
am: 421e1059b7

Change-Id: I26fe4bc95f91f410cf1242e698e94ed4231c01ee