Merge "bootstat: Fix the build on git_mnc-dr1.5-dev-plus-aosp by adding missing C++ includes" am: 2026cca40f
am: 4ac60013d4

* commit '4ac60013d453b534517b829848893571639ebd2c':
  bootstat: Fix the build on git_mnc-dr1.5-dev-plus-aosp by adding missing C++ includes