Merge "bootstat: Followup cleanups from the initial bootstat checkin." am: 17bcba1631
am: aae8b5536e

* commit 'aae8b5536ec7db764e965e0976e3c93c29b8e8f5':
  bootstat: Followup cleanups from the initial bootstat checkin.