gd: rebuild with latest upstream changes