Merge "Removed e4crypt_create_device_key" am: 582a79634a
am: 6cf3d8775f

Change-Id: Icb460a36cabc6181af15f8c8beaf4877934d6a31