Merge "Remove obsolete CUSTOM_KERNEL_HEADERS."