am: fix stgit patch mangling