this also fixes clang and gcc 5.3 build issues remove merged patches Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Armin Kuster <akuster@mvista.com>