Merge "libfscrypt: Do not encrypt the "gsi" folder." am: de8da60180
am: 63c62374b7

Change-Id: I268dedba401b9944d97dcdd7fe895da4104e342a