Add generic-3.16.x to cherry pick tool