Merge "logd: Remove $(KERNEL_HEADERS) include."