Merge "Revert "Support Speck encryption.""
am: 7d4e7d3156

Change-Id: I4fbd66f6fa138d8f3910f8bd9ecc5d8e9a106f8d