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