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

Change-Id: Ic49d3a28f86fe61560b0562baf1690e2248caad0