Merge with mainline to bring in SPDX markings to avoid annoying merge
problems when some header files get deleted.