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

Change-Id: Iaa851a756275b0027e8415e92a6391d4640bbc1f