Merge "cryptfs: Remove Speck support" am: cf0cb0bc1f am: 421e1059b7 am: 1bc4f99b35
am: 60d1ab92cc

Change-Id: Icb65ca14fa9df102d9c531ee871ee8f083cbbcd7