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

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