Remove an upstreamed patch and rebase all remaining patches. Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com> (cherry picked from commit f4cdef2191)
f4cdef2191