Regenerated patches to have proper offsets for gcc 4.9.2