Merge "Removed e4crypt_create_device_key" into oc-dev
am: 2fbc9b893f

Change-Id: I52922052fc3d1d618f9332bd46b583f7e288112b