Merge changes from topic "e4crypt_to_fscrypt" am: ddbd8325f5
am: e6680f17a8

Change-Id: Ie093f99065ac99b31ab92910b5618473057c07e2