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

Change-Id: I4f86e73f46da5e9cfdc3bc76f9833e233c313aaf