Bug 925747 - patch file extraction cleanup. r=bbondy