Update cmake and refresh patches. Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi> (backported from 55fa8068c4)
55fa8068c4