Fix exFAT being broken with O2+

Change-Id: Iac5f50e008094a7fe5ad74f50ac94738b61a2b9c