Fix cherry_pick for TIE

If cherry_pick is called when we are inside TIE dir then the script
fails. Instead call cherry_pick together with others ince we get out
of TIE dir.