Merge "Removed e4crypt_create_device_key"
am: 582a79634a

Change-Id: I23e8519eaf880d9d9f76ee651d2af966d1271e8e