(CVE-2015-7833, partly fixed in 4.2.6-1) Also update headers of the previous patch to match the commit in media_tree.git.