Merge "Update the kernel headers to match external/kernel-headers."