Merge changes from topic "e4crypt_to_fscrypt"
am: ddbd8325f5

Change-Id: Ifbe5a1bfd2d9a4b0e97197ab91358df356b0d0b2