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

Change-Id: I4326d686edb8b0e7bbd27f260597a5c6b8f131c3