This has been repeated for so long that in the meantime enough of the changes have been upstreamed such that Android has been able to run with the upstream kernel since 6 years ago.