Cherrypick exfat compilation fix