Merge "bootstat: Fix the build on git_mnc-dr1.5-dev-plus-aosp by adding...
Merge "bootstat: Fix the build on git_mnc-dr1.5-dev-plus-aosp by adding missing C++ includes" am: 2026cca4
am: 4ac60013
* commit '4ac60013':
bootstat: Fix the build on git_mnc-dr1.5-dev-plus-aosp by adding missing C++ includes