convert remaining diffs to upstream build.xml into a quilt style patch