Update patches to keep them sync'ed with that ones submitted to upstream.

Signed-off-by: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>