Merge "Revert "bootstat: Handle v1 record files which do not contain file contents."" into nyc-dev
am: 197b628  -s ours

* commit '197b62852b27021f2a388be7b6a49329a082c665':
  Revert "bootstat: Handle v1 record files which do not contain file contents."