[RCAR] Remove upstream patch