Merge "cryptfs: Remove Speck support"
am: cf0cb0bc1f

Change-Id: I4e44dd132d94b7583ab2df50469ac80bf9ae7a9b