Merge "Revert "bootstat: Handle v1 record files which do not contain file contents.""