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

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