Merge "Remove references to KERNEL_HEADERS."