Merge "bootstat: Fix the base includes to be AOSP-friendly."
am: d320cbf5ba

* commit 'd320cbf5ba1b4490700f2ff89af29f28a2e326e3':
  bootstat: Fix the base includes to be AOSP-friendly.