Also remove two patches that have been merged upstream into v4l-util
since 1.12.3 and update the diff for patch 0002-contrib-* to prevent a
build warning.
Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>