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

Change-Id: Iaf0da57d4d0829b49f87ec57886a156b01d786f1