Regenerate the final .dat file to match my merge resolution.

I regenerated the -all.dat file, but not the -default.dat file that
actually gets used :-(

Change-Id: I979f5d0130b14bf0e6a9b2d526ec1506e1bcd0fc
1 file changed