am 02cb925c: Merge "Stop abusing KERNEL_HEADERS."

* commit '02cb925ca99b6fe98f687cfa7d332158c045f441':
  Stop abusing KERNEL_HEADERS.