hawaii-shell: Remove upstreamed patches