Merge "cryptfs: check for errors in create_encrypted_random_key()" am: f156c40404 am: 8938607c02
am: d043f574a8

Change-Id: I46e5b938b70b3fada8ced6c63a35d62df6a53354